From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by sourceware.org (Postfix) with ESMTPS id 0E6323858C74 for ; Sun, 20 Mar 2022 23:42:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0E6323858C74 Received: by mail-pj1-x1031.google.com with SMTP id mr5-20020a17090b238500b001c67366ae93so10476161pjb.4 for ; Sun, 20 Mar 2022 16:42:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=G/02nyDxKrjk7a4NKOUxu5geTLqUzKthxbioVRb/hwo=; b=i/gAAWV9xqEX1lCf0j7xpyooCDzbPS3T6pB6cgjFq3JvHmV/4IpfvkbXmTGXoLHQxZ r2DW5Uz9f4qJIMkCr03dlvq+zHPX0RK4yDdexLYheV4dpf8W1GS73C/jizWbhPzhIFGz KqkVZ5Buj1Js9cEfC25EIdQHnQZqh56HhkO6Zir+EXYHCw32HNAl7SZddAPpKxUF0aur 907VxPizd3n/E1IFdxCLPfwiEFmeRZ8ZspMcXU8Ci+LMkNTStgSoqIeWCuIqFppQFX2m 1Uq7YxuQjPRtnqTrd3xqywABdQ7DWb7BxfQqPPfGicHufhNrHjbcnfp/NJu1CZ5ceeX8 a7Fg== X-Gm-Message-State: AOAM531UidawrAVxgL3z46Y4VVg8uyfKhPzQ9DPYOawAFHA3Eaq2x0gD e+F8ivVQBBuuTqWotGhXL4YxSJLPCUY= X-Google-Smtp-Source: ABdhPJyq2eGBZaSppy/m9+gUAGEeaaUxhM0G/hcYxsj3vqleaI2gX/iK6aoE2DjpfMjCBtdJDnwNxQ== X-Received: by 2002:a17:90b:1b0f:b0:1c6:ed78:67ad with SMTP id nu15-20020a17090b1b0f00b001c6ed7867admr7475874pjb.41.1647819775663; Sun, 20 Mar 2022 16:42:55 -0700 (PDT) Received: from gnu-tgl-3.localdomain ([172.58.38.226]) by smtp.gmail.com with ESMTPSA id j7-20020a17090a31c700b001c6dbb70c94sm5113287pjf.18.2022.03.20.16.42.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Mar 2022 16:42:55 -0700 (PDT) Received: from gnu-tgl-3.. (localhost [IPv6:::1]) by gnu-tgl-3.localdomain (Postfix) with ESMTP id 17CC1C0266; Sun, 20 Mar 2022 16:42:54 -0700 (PDT) From: "H.J. Lu" To: binutils@sourceware.org Subject: [PATCH] gprofng: Don't install libcollector header files Date: Sun, 20 Mar 2022 16:42:54 -0700 Message-Id: <20220320234254.63429-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3029.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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, 20 Mar 2022 23:42:59 -0000 Since libcollector is internal to gprofng, don't install its header files. PR gprofng/28982 * libcollector/Makefile.am (myincludedir): Removed. (myinclude_HEADERS): Likewise. --- gprofng/libcollector/Makefile.am | 5 --- gprofng/libcollector/Makefile.in | 53 ++++++++------------------------ 2 files changed, 12 insertions(+), 46 deletions(-) diff --git a/gprofng/libcollector/Makefile.am b/gprofng/libcollector/Makefile.am index 901d9a5f0ee..50753a4a4fb 100644 --- a/gprofng/libcollector/Makefile.am +++ b/gprofng/libcollector/Makefile.am @@ -49,11 +49,6 @@ AM_LDFLAGS = -module -avoid-version \ -Wl,--version-script,$(srcdir)/mapfile.$(GPROFNG_VARIANT) \ $(LD_NO_AS_NEEDED) -Wl,-lrt -Wl,-ldl -myincludedir = @includedir@ -myinclude_HEADERS = $(srcdir)/../../include/collectorAPI.h \ - $(srcdir)/../../include/libcollector.h \ - $(srcdir)/../../include/libfcollector.h - lib_LTLIBRARIES = libgp-collector.la libgp-collectorAPI.la libgp-heap.la \ libgp-sync.la libgp-iotrace.la diff --git a/gprofng/libcollector/Makefile.in b/gprofng/libcollector/Makefile.in index e871294fe74..b38a8eef8bd 100644 --- a/gprofng/libcollector/Makefile.in +++ b/gprofng/libcollector/Makefile.in @@ -31,7 +31,6 @@ # along with this program; see the file COPYING3. If not see # . - VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -122,7 +121,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ - $(am__configure_deps) $(myinclude_HEADERS) $(am__DIST_COMMON) + $(am__configure_deps) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs @@ -156,7 +155,7 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(myincludedir)" +am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) libgp_collector_la_DEPENDENCIES = am__objects_1 = libgp_collector_la-gethrtime.lo \ @@ -247,7 +246,6 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -HEADERS = $(myinclude_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -451,11 +449,6 @@ AM_LDFLAGS = -module -avoid-version \ -Wl,--version-script,$(srcdir)/mapfile.$(GPROFNG_VARIANT) \ $(LD_NO_AS_NEEDED) -Wl,-lrt -Wl,-ldl -myincludedir = @includedir@ -myinclude_HEADERS = $(srcdir)/../../include/collectorAPI.h \ - $(srcdir)/../../include/libcollector.h \ - $(srcdir)/../../include/libfcollector.h - lib_LTLIBRARIES = libgp-collector.la libgp-collectorAPI.la libgp-heap.la \ libgp-sync.la libgp-iotrace.la @@ -755,27 +748,6 @@ clean-libtool: distclean-libtool: -rm -f libtool config.lt -install-myincludeHEADERS: $(myinclude_HEADERS) - @$(NORMAL_INSTALL) - @list='$(myinclude_HEADERS)'; test -n "$(myincludedir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(myincludedir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(myincludedir)" || 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)$(myincludedir)'"; \ - $(INSTALL_HEADER) $$files "$(DESTDIR)$(myincludedir)" || exit $$?; \ - done - -uninstall-myincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(myinclude_HEADERS)'; test -n "$(myincludedir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(myincludedir)'; $(am__uninstall_files_from_dir) ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -1001,9 +973,9 @@ distcleancheck: distclean exit 1; } >&2 check-am: all-am check: check-am -all-am: Makefile $(LTLIBRARIES) $(HEADERS) lib-config.h +all-am: Makefile $(LTLIBRARIES) lib-config.h installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(myincludedir)"; do \ + for dir in "$(DESTDIR)$(libdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1060,7 +1032,7 @@ info: info-am info-am: -install-data-am: install-myincludeHEADERS +install-data-am: install-dvi: install-dvi-am @@ -1108,7 +1080,7 @@ ps: ps-am ps-am: -uninstall-am: uninstall-libLTLIBRARIES uninstall-myincludeHEADERS +uninstall-am: uninstall-libLTLIBRARIES .MAKE: all install-am install-strip @@ -1122,13 +1094,12 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-myincludeHEADERS 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-info install-info-am \ - install-libLTLIBRARIES install-man install-myincludeHEADERS \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ - uninstall-libLTLIBRARIES uninstall-myincludeHEADERS + install-libLTLIBRARIES install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES .PRECIOUS: Makefile -- 2.35.1