From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) by sourceware.org (Postfix) with ESMTPS id 91FFF3858C39 for ; Sun, 23 Jan 2022 18:43:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 91FFF3858C39 Received: by mail-pg1-x531.google.com with SMTP id z131so2131533pgz.12 for ; Sun, 23 Jan 2022 10:43:48 -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=5Knj7Ds2dm+mEtPiD9hk9EMf4C638oztepJuuEvFHck=; b=R/ri3PB3oda6nw4ib8CZd2a5md8WubsCXojApSBQw4QpUThQOclYHbGMpiaHnRiKtS om+wszJuWij4XxXZ1KU+IyDPPgNJVn2HARZsUd0LGjxs6AfV4UgNFBfMcWpNGvMh1Wb1 tixmA/KQ9GHxbriu4O6JTgtkYzlz8UwHMy8gDgqIQ6Go797+DNh3RaiG3GbhrwCeXsQg 7YBJAVpDrkF7aGppG97LDBw7PYW9PzitZC3qYNyr8DvU6ldJQT9+GUilavV/VzGCDyJa hw54NANuCs7OwB/iDuXBQYA63gB0rpwCPgBYIT8D+DUgNriP1NsZ42hwtdwlXNamK+nf BEww== X-Gm-Message-State: AOAM532RzSFAizROTp/kZpelgUBFc77lUlXKw4Vrt+ywtXJ2QTW8ALAo dxzJMk6lSTdkTqA90MZIJIe+GvH7tTI= X-Google-Smtp-Source: ABdhPJwbUlzwQOiZUwenTC1/i0YgGUw34F/9LXdKvZ9sgWj43z08s4vTOAXV2P2cwneLk0arp5M27A== X-Received: by 2002:a63:8f05:: with SMTP id n5mr9423432pgd.606.1642963425845; Sun, 23 Jan 2022 10:43:45 -0800 (PST) Received: from gnu-tgl-3.localdomain ([172.58.35.133]) by smtp.gmail.com with ESMTPSA id o13sm4585173pgu.89.2022.01.23.10.43.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jan 2022 10:43:45 -0800 (PST) Received: from gnu-tgl-3.. (localhost [IPv6:::1]) by gnu-tgl-3.localdomain (Postfix) with ESMTP id 0D155C02EA for ; Sun, 23 Jan 2022 10:43:44 -0800 (PST) From: "H.J. Lu" To: binutils@sourceware.org Subject: [PATCH] bfd: Partially revert commit 0e3839bde6f Date: Sun, 23 Jan 2022 10:43:43 -0800 Message-Id: <20220123184343.277882-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.8 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 18:43:52 -0000 Partially revert commit 0e3839bde6f93e1e3eefce815be3636e3d81054d Author: H.J. Lu Date: Sun Jan 23 07:29:27 2022 -0800 bfd: Properly install library and header files PR binutils/28807 * Makefile.am: Revert bfdlib_LTLIBRARIES and bfdinclude_HEADERS changes. * Makefile.in: Regenerate. --- bfd/Makefile.am | 10 ++--- bfd/Makefile.in | 116 ++++++++++++++++++++++++------------------------ 2 files changed, 64 insertions(+), 62 deletions(-) diff --git a/bfd/Makefile.am b/bfd/Makefile.am index 8866d4d2d6a..0f0138408ce 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -36,14 +36,14 @@ libbfd_la_LDFLAGS = if INSTALL_LIBBFD bfdlibdir = @bfdlibdir@ bfdincludedir = @bfdincludedir@ -lib_LTLIBRARIES = libbfd.la -include_HEADERS = $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - $(INCDIR)/diagnostics.h $(INCDIR)/bfdlink.h +bfdlib_LTLIBRARIES = libbfd.la +bfdinclude_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 = -include_HEADERS = +bfdinclude_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 -include_HEADERS += $(INCDIR)/plugin-api.h +bfdinclude_HEADERS += $(INCDIR)/plugin-api.h LIBDL = @lt_cv_dlopen_libs@ endif diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 3269503ac10..e48a0b87bc9 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__include_HEADERS_DIST) + $(am__configure_deps) $(am__bfdinclude_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)$(libdir)" "$(DESTDIR)$(infodir)" \ - "$(DESTDIR)$(includedir)" -LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) +am__installdirs = "$(DESTDIR)$(bfdlibdir)" "$(DESTDIR)$(infodir)" \ + "$(DESTDIR)$(bfdincludedir)" +LTLIBRARIES = $(bfdlib_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 $(libdir) +@INSTALL_LIBBFD_TRUE@am_libbfd_la_rpath = -rpath $(bfdlibdir) 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__include_HEADERS_DIST = $(INCDIR)/plugin-api.h bfd.h \ +am__bfdinclude_HEADERS_DIST = $(INCDIR)/plugin-api.h bfd.h \ $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ $(INCDIR)/diagnostics.h $(INCDIR)/bfdlink.h -HEADERS = $(include_HEADERS) +HEADERS = $(bfdinclude_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@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@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@ $(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-libLTLIBRARIES: $(lib_LTLIBRARIES) +install-bfdlibLTLIBRARIES: $(bfdlib_LTLIBRARIES) @$(NORMAL_INSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + @list='$(bfdlib_LTLIBRARIES)'; test -n "$(bfdlibdir)" || 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)$(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)"; \ + 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)"; \ } -uninstall-libLTLIBRARIES: +uninstall-bfdlibLTLIBRARIES: @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + @list='$(bfdlib_LTLIBRARIES)'; test -n "$(bfdlibdir)" || list=; \ for p in $$list; do \ $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(bfdlibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(bfdlibdir)/$$f"; \ done -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; \ +clean-bfdlibLTLIBRARIES: + -test -z "$(bfdlib_LTLIBRARIES)" || rm -f $(bfdlib_LTLIBRARIES) + @list='$(bfdlib_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-includeHEADERS: $(include_HEADERS) +install-bfdincludeHEADERS: $(bfdinclude_HEADERS) @$(NORMAL_INSTALL) - @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ + @list='$(bfdinclude_HEADERS)'; test -n "$(bfdincludedir)" || list=; \ if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \ + echo " $(MKDIR_P) '$(DESTDIR)$(bfdincludedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bfdincludedir)" || 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)$(includedir)'"; \ - $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(bfdincludedir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(bfdincludedir)" || exit $$?; \ done -uninstall-includeHEADERS: +uninstall-bfdincludeHEADERS: @$(NORMAL_UNINSTALL) - @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ + @list='$(bfdinclude_HEADERS)'; test -n "$(bfdincludedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) + dir='$(DESTDIR)$(bfdincludedir)'; $(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,7 +2045,7 @@ all-am: Makefile $(INFO_DEPS) $(LIBRARIES) $(LTLIBRARIES) $(HEADERS) \ config.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(includedir)"; do \ + for dir in "$(DESTDIR)$(bfdlibdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(bfdincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -2087,7 +2087,7 @@ maintainer-clean-generic: -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-recursive -clean-am: clean-aminfo clean-generic clean-libLTLIBRARIES \ +clean-am: clean-aminfo clean-bfdlibLTLIBRARIES clean-generic \ clean-libtool clean-noinstLIBRARIES clean-noinstLTLIBRARIES \ mostlyclean-am @@ -2110,7 +2110,8 @@ info: info-recursive info-am: $(INFO_DEPS) -install-data-am: install-includeHEADERS install-info-am +install-data-am: install-bfdincludeHEADERS install-bfdlibLTLIBRARIES \ + install-info-am install-dvi: install-dvi-recursive @@ -2129,7 +2130,7 @@ install-dvi-am: $(DVIS) echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dvidir)'"; \ $(INSTALL_DATA) $$files "$(DESTDIR)$(dvidir)" || exit $$?; \ done -install-exec-am: install-libLTLIBRARIES +install-exec-am: install-html: install-html-recursive @@ -2250,33 +2251,34 @@ ps: ps-recursive ps-am: $(PSS) -uninstall-am: uninstall-dvi-am uninstall-html-am \ - uninstall-includeHEADERS uninstall-info-am \ - uninstall-libLTLIBRARIES uninstall-pdf-am uninstall-ps-am +uninstall-am: uninstall-bfdincludeHEADERS uninstall-bfdlibLTLIBRARIES \ + uninstall-dvi-am uninstall-html-am uninstall-info-am \ + 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-cscope \ - clean-generic clean-libLTLIBRARIES clean-libtool \ - clean-noinstLIBRARIES clean-noinstLTLIBRARIES cscope \ - cscopelist-am ctags ctags-am dist-info distclean \ + 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 \ 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-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 + 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 .PRECIOUS: Makefile -- 2.34.1