1 From edd36b26f3506eeb259534ba2493e15c728cd280 Mon Sep 17 00:00:00 2001
2 From: Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
3 Date: Wed, 25 Jan 2023 19:21:38 -0800
4 Subject: [PATCH 20/50] gprofng: PR30043 libgprofng.so.* are installed to a
8 2023-01-25 Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
12 * src/Makefile.am: Use lib_LTLIBRARIES instead of pkglib_LTLIBRARIES.
13 * src/Makefile.in: Rebuild.
15 gprofng/src/Makefile.am | 7 +---
16 gprofng/src/Makefile.in | 76 +++++++++++++++++++----------------------
17 2 files changed, 37 insertions(+), 46 deletions(-)
19 --- a/gprofng/src/Makefile.am
20 +++ b/gprofng/src/Makefile.am
21 @@ -124,7 +124,7 @@ BUILT_SOURCES = QLParser.tab.hh
22 EXTRA_DIST = QLParser.yy $(man_MANS)
25 -pkglib_LTLIBRARIES = $(LIBGPROFNG)
26 +lib_LTLIBRARIES = $(LIBGPROFNG)
27 libgprofng_la_SOURCES = $(CCSOURCES) $(CSOURCES)
28 libgprofng_la_LDFLAGS = -version-info 0:0:0
30 @@ -215,9 +215,4 @@ endif
31 # so ensure that the necessary libraries are built at dist time.
32 dist-hook: $(LIBGPROFNG)
34 -.PHONY: install-data-local
36 -install-data-local: install-pkglibLTLIBRARIES
37 - rm -f $(DESTDIR)/$(pkglibdir)/*.la $(DESTDIR)/$(pkglibdir)/*.a
39 $(srcdir)/DbeSession.cc: QLParser.tab.hh
40 --- a/gprofng/src/Makefile.in
41 +++ b/gprofng/src/Makefile.in
42 @@ -155,9 +155,9 @@ am__uninstall_files_from_dir = { \
43 || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
44 $(am__cd) "$$dir" && rm -f $$files; }; \
46 -am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" \
47 +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
48 "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(dbedir)"
49 -LTLIBRARIES = $(pkglib_LTLIBRARIES)
50 +LTLIBRARIES = $(lib_LTLIBRARIES)
52 libgprofng_la_DEPENDENCIES = $(top_builddir)/../opcodes/libopcodes.la \
53 $(top_builddir)/../bfd/libbfd.la $(am__DEPENDENCIES_1)
54 @@ -548,7 +548,7 @@ AM_CFLAGS = $(GPROFNG_CFLAGS) $(PTHREAD_
55 AM_CXXFLAGS = $(AM_CFLAGS)
56 BUILT_SOURCES = QLParser.tab.hh
57 EXTRA_DIST = QLParser.yy $(man_MANS)
58 -pkglib_LTLIBRARIES = $(LIBGPROFNG)
59 +lib_LTLIBRARIES = $(LIBGPROFNG)
60 libgprofng_la_SOURCES = $(CCSOURCES) $(CSOURCES)
61 libgprofng_la_LDFLAGS = -version-info 0:0:0
63 @@ -636,33 +636,33 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
64 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
65 $(am__aclocal_m4_deps):
67 -install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
68 +install-libLTLIBRARIES: $(lib_LTLIBRARIES)
70 - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
71 + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
72 list2=; for p in $$list; do \
73 if test -f $$p; then \
74 list2="$$list2 $$p"; \
77 test -z "$$list2" || { \
78 - echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
79 - $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
80 - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
81 - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
82 + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
83 + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
84 + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
85 + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
88 -uninstall-pkglibLTLIBRARIES:
89 +uninstall-libLTLIBRARIES:
91 - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
92 + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
95 - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
96 - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
97 + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
98 + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
101 -clean-pkglibLTLIBRARIES:
102 - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
103 - @list='$(pkglib_LTLIBRARIES)'; \
104 +clean-libLTLIBRARIES:
105 + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
106 + @list='$(lib_LTLIBRARIES)'; \
107 locs=`for p in $$list; do echo $$p; done | \
108 sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
110 @@ -672,7 +672,7 @@ clean-pkglibLTLIBRARIES:
113 libgprofng.la: $(libgprofng_la_OBJECTS) $(libgprofng_la_DEPENDENCIES) $(EXTRA_libgprofng_la_DEPENDENCIES)
114 - $(AM_V_CXXLD)$(libgprofng_la_LINK) -rpath $(pkglibdir) $(libgprofng_la_OBJECTS) $(libgprofng_la_LIBADD) $(LIBS)
115 + $(AM_V_CXXLD)$(libgprofng_la_LINK) -rpath $(libdir) $(libgprofng_la_OBJECTS) $(libgprofng_la_LIBADD) $(LIBS)
116 install-binPROGRAMS: $(bin_PROGRAMS)
118 @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
119 @@ -1039,8 +1039,10 @@ check-am: all-am
120 check: $(BUILT_SOURCES)
121 $(MAKE) $(AM_MAKEFLAGS) check-am
122 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(DATA)
123 +install-binPROGRAMS: install-libLTLIBRARIES
126 - for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(dbedir)"; do \
127 + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(dbedir)"; do \
128 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
130 install: $(BUILT_SOURCES)
131 @@ -1078,8 +1080,8 @@ maintainer-clean-generic:
132 -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
135 -clean-am: clean-binPROGRAMS clean-generic clean-libtool \
136 - clean-pkglibLTLIBRARIES mostlyclean-am
137 +clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
138 + clean-libtool mostlyclean-am
140 distclean: distclean-am
142 @@ -1099,13 +1101,13 @@ info: info-am
146 -install-data-am: install-data-local install-dbeDATA install-man
147 +install-data-am: install-dbeDATA install-man
149 install-dvi: install-dvi-am
153 -install-exec-am: install-binPROGRAMS install-pkglibLTLIBRARIES
154 +install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
156 install-html: install-html-am
158 @@ -1145,30 +1147,29 @@ ps: ps-am
162 -uninstall-am: uninstall-binPROGRAMS uninstall-dbeDATA uninstall-man \
163 - uninstall-pkglibLTLIBRARIES
164 +uninstall-am: uninstall-binPROGRAMS uninstall-dbeDATA \
165 + uninstall-libLTLIBRARIES uninstall-man
167 uninstall-man: uninstall-man1
169 .MAKE: all check install install-am install-strip
171 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
172 - clean-binPROGRAMS clean-generic clean-libtool \
173 - clean-pkglibLTLIBRARIES cscopelist-am ctags ctags-am dist-hook \
174 - distclean distclean-compile distclean-generic \
175 - distclean-libtool distclean-tags distdir dvi dvi-am html \
176 - html-am info info-am install install-am install-binPROGRAMS \
177 - install-data install-data-am install-data-local \
178 - install-dbeDATA install-dvi install-dvi-am install-exec \
179 - install-exec-am install-html install-html-am install-info \
180 - install-info-am install-man install-man1 install-pdf \
181 - install-pdf-am install-pkglibLTLIBRARIES install-ps \
182 + clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
183 + clean-libtool cscopelist-am ctags ctags-am dist-hook distclean \
184 + distclean-compile distclean-generic distclean-libtool \
185 + distclean-tags distdir dvi dvi-am html html-am info info-am \
186 + install install-am install-binPROGRAMS install-data \
187 + install-data-am install-dbeDATA install-dvi install-dvi-am \
188 + install-exec install-exec-am install-html install-html-am \
189 + install-info install-info-am install-libLTLIBRARIES \
190 + install-man install-man1 install-pdf install-pdf-am install-ps \
191 install-ps-am install-strip installcheck installcheck-am \
192 installdirs maintainer-clean maintainer-clean-generic \
193 mostlyclean mostlyclean-compile mostlyclean-generic \
194 mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
195 uninstall-am uninstall-binPROGRAMS uninstall-dbeDATA \
196 - uninstall-man uninstall-man1 uninstall-pkglibLTLIBRARIES
197 + uninstall-libLTLIBRARIES uninstall-man uninstall-man1
201 @@ -1198,11 +1199,6 @@ QLParser.tab.cc QLParser.tab.hh: QLParse
202 # so ensure that the necessary libraries are built at dist time.
203 dist-hook: $(LIBGPROFNG)
205 -.PHONY: install-data-local
207 -install-data-local: install-pkglibLTLIBRARIES
208 - rm -f $(DESTDIR)/$(pkglibdir)/*.la $(DESTDIR)/$(pkglibdir)/*.a
210 $(srcdir)/DbeSession.cc: QLParser.tab.hh
212 # Tell versions [3.59,3.63) of GNU make to not export all variables.