Makefile.am (install-glibcppinstallHEADERS, [...]): Have explicit rules catering to SUN make VPATH peculiarities.

* libsupc++/Makefile.am (install-glibcppinstallHEADERS,
	uninstall-glibcppinstallHEADERS): Have explicit rules catering to
	SUN make VPATH peculiarities.
	* libsupc++/Makefile.in: Regenerate.

From-SVN: r42844
This commit is contained in:
Hans-Peter Nilsson 2001-06-04 02:24:06 +00:00 committed by Hans-Peter Nilsson
parent 35fb60c476
commit 38fae3e375
3 changed files with 45 additions and 15 deletions

View File

@ -1,3 +1,10 @@
2001-06-04 Hans-Peter Nilsson <hp@axis.com>
* libsupc++/Makefile.am (install-glibcppinstallHEADERS,
uninstall-glibcppinstallHEADERS): Have explicit rules catering to
SUN make VPATH peculiarities.
* libsupc++/Makefile.in: Regenerate.
2001-06-01 Hans-Peter Nilsson <hp@axis.com>
* src/Makefile.am (VPATH): Delimit with ":", not space.

View File

@ -148,3 +148,22 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared \
CXXLINK = $(LIBTOOL) --tag CXX --tag disable-shared \
--mode=link $(CXX) \
@OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
# We have to have rules modified from the default to counteract SUN make
# prepending each of $(glibcppinstall_HEADERS) with VPATH below.
install-glibcppinstallHEADERS: $(glibcppinstall_HEADERS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(glibcppinstalldir)
@list='$(glibcppinstall_HEADERS)'; for p in $$list; do \
q=`echo $$p | sed -e 's,.*/,,'`; \
if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(glibcppinstalldir)/$$q"; \
$(INSTALL_DATA) $$d$$p $(DESTDIR)$(glibcppinstalldir)/$$q; \
done
uninstall-glibcppinstallHEADERS:
@$(NORMAL_UNINSTALL)
list='$(glibcppinstall_HEADERS)'; for p in $$list; do \
q=`echo $$p | sed -e 's,.*/,,'`; \
rm -f $(DESTDIR)$(glibcppinstalldir)/$$q; \
done

View File

@ -343,21 +343,6 @@ libsupc++.la: $(libsupc___la_OBJECTS) $(libsupc___la_DEPENDENCIES)
.cc.lo:
$(LTCXXCOMPILE) -c $<
install-glibcppinstallHEADERS: $(glibcppinstall_HEADERS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(glibcppinstalldir)
@list='$(glibcppinstall_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(glibcppinstalldir)/$$p"; \
$(INSTALL_DATA) $$d$$p $(DESTDIR)$(glibcppinstalldir)/$$p; \
done
uninstall-glibcppinstallHEADERS:
@$(NORMAL_UNINSTALL)
list='$(glibcppinstall_HEADERS)'; for p in $$list; do \
rm -f $(DESTDIR)$(glibcppinstalldir)/$$p; \
done
tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP)
@ -490,6 +475,25 @@ mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
# We have to have rules modified from the default to counteract SUN make
# prepending each of $(glibcppinstall_HEADERS) with VPATH below.
install-glibcppinstallHEADERS: $(glibcppinstall_HEADERS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(glibcppinstalldir)
@list='$(glibcppinstall_HEADERS)'; for p in $$list; do \
q=`echo $$p | sed -e 's,.*/,,'`; \
if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(glibcppinstalldir)/$$q"; \
$(INSTALL_DATA) $$d$$p $(DESTDIR)$(glibcppinstalldir)/$$q; \
done
uninstall-glibcppinstallHEADERS:
@$(NORMAL_UNINSTALL)
list='$(glibcppinstall_HEADERS)'; for p in $$list; do \
q=`echo $$p | sed -e 's,.*/,,'`; \
rm -f $(DESTDIR)$(glibcppinstalldir)/$$q; \
done
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: