From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by sourceware.org (Postfix) with ESMTPS id 30B633858C3A for ; Sun, 23 Jan 2022 15:36:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 30B633858C3A Received: by mail-pf1-x432.google.com with SMTP id e28so9084602pfj.5 for ; Sun, 23 Jan 2022 07:36:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=gWyS1u9GK1Bct/hjFAFGfshshh4bSyoU95oAM2XXXhY=; b=ot3FcealjNDuXCDYfVIpGDF8MfSbY37SU7dPSmrlAuFAeGzZ4AZwUn6Dn6uQZkUUGt s1MHLNyoZrDDlarvRilsFMGoGvXjUKq8FxMqVY+s5ZeOaK0qQP2C9maWXG1C5Iy/elKW xaX6PcNOYq6c8cOKgyMwfydRiUoWB01IfOlIJIvgbrYxT7Li1ZFh1B5jz2OM2NlA/qIR AQDPGU3sxB0rl9sO3ndgeR9FbWjFS0Ht2QakKz4IDk0vUtQFKNySBOwwKDGBec8Se/m0 qPsSFF5ewGLS6ovHTjy6C757SL6Biz+d6JZgwH1XtsvjGmma/TsQiYBmcxHiTEkGtmdt agzQ== X-Gm-Message-State: AOAM533e9WMKSQTu4+4iLcJtOqCLz/KehOJwOOxbv5U3I3eNogqKmqF/ RG+eM7sn5nULy8xaFgLS6KZ3eVXlhmg= X-Google-Smtp-Source: ABdhPJxHQ5mxiDUaWDFvvXuG3W1V4UZVvmcGPuMDdmDn8TnzES87hn7DHf3qN1uLpPFWOLmQi1W5Ww== X-Received: by 2002:a63:9412:: with SMTP id m18mr9249118pge.66.1642952217866; Sun, 23 Jan 2022 07:36:57 -0800 (PST) Received: from gnu-tgl-3.localdomain ([172.58.35.133]) by smtp.gmail.com with ESMTPSA id 5sm19409397pjf.34.2022.01.23.07.36.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jan 2022 07:36:57 -0800 (PST) Received: from gnu-tgl-2.localdomain (gnu-tgl-2 [192.168.1.42]) by gnu-tgl-3.localdomain (Postfix) with ESMTPS id D9FC4C0554 for ; Sun, 23 Jan 2022 07:36:55 -0800 (PST) Received: from gnu-tgl-2.. (localhost [IPv6:::1]) by gnu-tgl-2.localdomain (Postfix) with ESMTP id 37B6A300459 for ; Sun, 23 Jan 2022 07:36:52 -0800 (PST) From: "H.J. Lu" To: binutils@sourceware.org Subject: [PATCH] bfd: Properly install library and header files Date: Sun, 23 Jan 2022 07:36:52 -0800 Message-Id: <20220123153652.1130563-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3028.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Jan 2022 15:37:01 -0000 Rename bfdlib_LTLIBRARIES and bfdinclude_HEADERS to lib_LTLIBRARIES and include_HEADERS to fix the missing installed library and header files in bfd caused by commit bd32be01c997f686ab0b53f0640eaa0aeb61fbd3 Author: Mike Frysinger Date: Fri Dec 3 00:23:20 2021 -0500 bfd: merge doc subdir up a level PR binutils/28807 * Makefile.am (bfdlib_LTLIBRARIES): Renamed to ... (lib_LTLIBRARIES): This. (bfdinclude_HEADERS): Renamed to ... (include_HEADERS): This. * Makefile.in: Regenerate. * doc/local.mk (install): Removed. --- bfd/Makefile.am | 10 ++-- bfd/Makefile.in | 122 +++++++++++++++++++++++------------------------ bfd/doc/local.mk | 4 -- 3 files changed, 64 insertions(+), 72 deletions(-) diff --git a/bfd/Makefile.am b/bfd/Makefile.am index 0f0138408ce..8866d4d2d6a 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -36,14 +36,14 @@ libbfd_la_LDFLAGS = if INSTALL_LIBBFD bfdlibdir = @bfdlibdir@ bfdincludedir = @bfdincludedir@ -bfdlib_LTLIBRARIES = libbfd.la -bfdinclude_HEADERS = $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - $(INCDIR)/diagnostics.h $(INCDIR)/bfdlink.h +lib_LTLIBRARIES = libbfd.la +include_HEADERS = $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ + $(INCDIR)/diagnostics.h $(INCDIR)/bfdlink.h else !INSTALL_LIBBFD # Empty these so that the respective installation directories will not be created. bfdlibdir = bfdincludedir = -bfdinclude_HEADERS = +include_HEADERS = rpath_bfdlibdir = @bfdlibdir@ noinst_LTLIBRARIES = libbfd.la libbfd_la_LDFLAGS += -rpath $(rpath_bfdlibdir) @@ -60,7 +60,7 @@ NO_WERROR = @NO_WERROR@ AM_CFLAGS = $(WARN_CFLAGS) $(ZLIBINC) AM_CPPFLAGS = -DBINDIR='"$(bindir)"' -DLIBDIR='"$(libdir)"' @LARGEFILE_CPPFLAGS@ if PLUGINS -bfdinclude_HEADERS += $(INCDIR)/plugin-api.h +include_HEADERS += $(INCDIR)/plugin-api.h LIBDL = @lt_cv_dlopen_libs@ endif diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 71e5bb9e058..3269503ac10 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -134,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ - $(am__configure_deps) $(am__bfdinclude_HEADERS_DIST) + $(am__configure_deps) $(am__include_HEADERS_DIST) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs @@ -178,9 +178,9 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(bfdlibdir)" "$(DESTDIR)$(infodir)" \ - "$(DESTDIR)$(bfdincludedir)" -LTLIBRARIES = $(bfdlib_LTLIBRARIES) $(noinst_LTLIBRARIES) +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(infodir)" \ + "$(DESTDIR)$(includedir)" +LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) am__DEPENDENCIES_1 = am__objects_1 = archive.lo archures.lo bfd.lo bfdio.lo bfdwin.lo \ cache.lo coff-bfd.lo compress.lo corefile.lo elf-properties.lo \ @@ -198,7 +198,7 @@ libbfd_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libbfd_la_LDFLAGS) $(LDFLAGS) -o $@ @INSTALL_LIBBFD_FALSE@am_libbfd_la_rpath = -@INSTALL_LIBBFD_TRUE@am_libbfd_la_rpath = -rpath $(bfdlibdir) +@INSTALL_LIBBFD_TRUE@am_libbfd_la_rpath = -rpath $(libdir) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -289,10 +289,10 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -am__bfdinclude_HEADERS_DIST = $(INCDIR)/plugin-api.h bfd.h \ +am__include_HEADERS_DIST = $(INCDIR)/plugin-api.h bfd.h \ $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ $(INCDIR)/diagnostics.h $(INCDIR)/bfdlink.h -HEADERS = $(bfdinclude_HEADERS) +HEADERS = $(include_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive am__recursive_targets = \ @@ -513,10 +513,10 @@ SUBDIRS = po bfddocdir = doc libbfd_la_LDFLAGS = $(am__append_1) -release `cat libtool-soversion` \ @SHARED_LDFLAGS@ $(am__empty) -@INSTALL_LIBBFD_TRUE@bfdlib_LTLIBRARIES = libbfd.la -@INSTALL_LIBBFD_FALSE@bfdinclude_HEADERS = $(am__append_2) -@INSTALL_LIBBFD_TRUE@bfdinclude_HEADERS = $(BFD_H) \ -@INSTALL_LIBBFD_TRUE@ $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ +@INSTALL_LIBBFD_TRUE@lib_LTLIBRARIES = libbfd.la +@INSTALL_LIBBFD_FALSE@include_HEADERS = $(am__append_2) +@INSTALL_LIBBFD_TRUE@include_HEADERS = $(BFD_H) $(INCDIR)/ansidecl.h \ +@INSTALL_LIBBFD_TRUE@ $(INCDIR)/symcat.h \ @INSTALL_LIBBFD_TRUE@ $(INCDIR)/diagnostics.h \ @INSTALL_LIBBFD_TRUE@ $(INCDIR)/bfdlink.h $(am__append_2) @INSTALL_LIBBFD_FALSE@rpath_bfdlibdir = @bfdlibdir@ @@ -1388,33 +1388,33 @@ po/Makefile.in: $(top_builddir)/config.status $(top_srcdir)/po/Make-in clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -install-bfdlibLTLIBRARIES: $(bfdlib_LTLIBRARIES) +install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - @list='$(bfdlib_LTLIBRARIES)'; test -n "$(bfdlibdir)" || list=; \ + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ list2="$$list2 $$p"; \ else :; fi; \ done; \ test -z "$$list2" || { \ - echo " $(MKDIR_P) '$(DESTDIR)$(bfdlibdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(bfdlibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(bfdlibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(bfdlibdir)"; \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } -uninstall-bfdlibLTLIBRARIES: +uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) - @list='$(bfdlib_LTLIBRARIES)'; test -n "$(bfdlibdir)" || list=; \ + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ for p in $$list; do \ $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(bfdlibdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(bfdlibdir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ done -clean-bfdlibLTLIBRARIES: - -test -z "$(bfdlib_LTLIBRARIES)" || rm -f $(bfdlib_LTLIBRARIES) - @list='$(bfdlib_LTLIBRARIES)'; \ +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; \ locs=`for p in $$list; do echo $$p; done | \ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ sort -u`; \ @@ -1911,27 +1911,27 @@ maintainer-clean-aminfo: echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \ rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \ done -install-bfdincludeHEADERS: $(bfdinclude_HEADERS) +install-includeHEADERS: $(include_HEADERS) @$(NORMAL_INSTALL) - @list='$(bfdinclude_HEADERS)'; test -n "$(bfdincludedir)" || list=; \ + @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(bfdincludedir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(bfdincludedir)" || exit 1; \ + echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ done | $(am__base_list) | \ while read files; do \ - echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(bfdincludedir)'"; \ - $(INSTALL_HEADER) $$files "$(DESTDIR)$(bfdincludedir)" || exit $$?; \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \ done -uninstall-bfdincludeHEADERS: +uninstall-includeHEADERS: @$(NORMAL_UNINSTALL) - @list='$(bfdinclude_HEADERS)'; test -n "$(bfdincludedir)" || list=; \ + @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(bfdincludedir)'; $(am__uninstall_files_from_dir) + dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run 'make' without going through this Makefile. @@ -2045,9 +2045,11 @@ all-am: Makefile $(INFO_DEPS) $(LIBRARIES) $(LTLIBRARIES) $(HEADERS) \ config.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(bfdlibdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(bfdincludedir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-recursive install-exec: install-exec-recursive install-data: install-data-recursive uninstall: uninstall-recursive @@ -2085,7 +2087,7 @@ maintainer-clean-generic: -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-recursive -clean-am: clean-aminfo clean-bfdlibLTLIBRARIES clean-generic \ +clean-am: clean-aminfo clean-generic clean-libLTLIBRARIES \ clean-libtool clean-noinstLIBRARIES clean-noinstLTLIBRARIES \ mostlyclean-am @@ -2108,8 +2110,7 @@ info: info-recursive info-am: $(INFO_DEPS) -install-data-am: install-bfdincludeHEADERS install-bfdlibLTLIBRARIES \ - install-info-am +install-data-am: install-includeHEADERS install-info-am install-dvi: install-dvi-recursive @@ -2128,7 +2129,7 @@ install-dvi-am: $(DVIS) echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dvidir)'"; \ $(INSTALL_DATA) $$files "$(DESTDIR)$(dvidir)" || exit $$?; \ done -install-exec-am: +install-exec-am: install-libLTLIBRARIES install-html: install-html-recursive @@ -2249,34 +2250,33 @@ ps: ps-recursive ps-am: $(PSS) -uninstall-am: uninstall-bfdincludeHEADERS uninstall-bfdlibLTLIBRARIES \ - uninstall-dvi-am uninstall-html-am uninstall-info-am \ - uninstall-pdf-am uninstall-ps-am +uninstall-am: uninstall-dvi-am uninstall-html-am \ + uninstall-includeHEADERS uninstall-info-am \ + uninstall-libLTLIBRARIES uninstall-pdf-am uninstall-ps-am .MAKE: $(am__recursive_targets) all check install install-am \ install-strip .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ - am--refresh check check-am clean clean-aminfo \ - clean-bfdlibLTLIBRARIES clean-cscope clean-generic \ - clean-libtool clean-noinstLIBRARIES clean-noinstLTLIBRARIES \ - cscope cscopelist-am ctags ctags-am dist-info distclean \ + am--refresh check check-am clean clean-aminfo clean-cscope \ + clean-generic clean-libLTLIBRARIES clean-libtool \ + clean-noinstLIBRARIES clean-noinstLTLIBRARIES cscope \ + cscopelist-am ctags ctags-am dist-info distclean \ distclean-compile distclean-generic distclean-hdr \ distclean-libtool distclean-tags dvi dvi-am html html-am \ - html-local info info-am install install-am \ - install-bfdincludeHEADERS install-bfdlibLTLIBRARIES \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-aminfo \ - maintainer-clean-generic mostlyclean mostlyclean-aminfo \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ - uninstall-bfdincludeHEADERS uninstall-bfdlibLTLIBRARIES \ - uninstall-dvi-am uninstall-html-am uninstall-info-am \ - uninstall-pdf-am uninstall-ps-am + html-local info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am \ + install-includeHEADERS install-info install-info-am \ + install-libLTLIBRARIES install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-aminfo maintainer-clean-generic mostlyclean \ + mostlyclean-aminfo mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-dvi-am uninstall-html-am \ + uninstall-includeHEADERS uninstall-info-am \ + uninstall-libLTLIBRARIES uninstall-pdf-am uninstall-ps-am .PRECIOUS: Makefile @@ -2521,10 +2521,6 @@ doc/bfdver.texi: $(srcdir)/Makefile.in echo "@set BUGURL $(REPORT_BUGS_TEXI)" >> $@; \ fi -# We want install to imply install-info as per GNU standards, despite the -# cygnus option. -install: install-info - html-local: doc/bfd/index.html doc/bfd/index.html: doc/bfd.texi $(bfd_TEXINFOS) doc/$(am__dirstamp) $(AM_V_at)$(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) \ diff --git a/bfd/doc/local.mk b/bfd/doc/local.mk index 0f4ada596ad..18a2af1b01d 100644 --- a/bfd/doc/local.mk +++ b/bfd/doc/local.mk @@ -144,10 +144,6 @@ DISTCLEANFILES += %D%/bfd.?? %D%/bfd.??? texput.log MAINTAINERCLEANFILES += $(DOCFILES) -# We want install to imply install-info as per GNU standards, despite the -# cygnus option. -install: install-info - html-local: %D%/bfd/index.html %D%/bfd/index.html: %D%/bfd.texi $(bfd_TEXINFOS) %D%/$(am__dirstamp) $(AM_V_at)$(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) \ -- 2.34.1