[PATCH] gprofng: Don't install libcollector header files

[H.J. Lu]

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
 # <http://www.gnu.org/licenses/>.
 
-
 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