diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2004-01-05 16:05:08 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2004-01-05 16:05:08 +0000 |
| commit | 4714a839b07d66116065d2c9b3e7c6030f11e019 (patch) | |
| tree | ca688e392ec881e79b2354acb7321c9283e72f12 /gnu/lib/libstdc++ | |
| parent | 12de70a1e65f594a861f397bdf818570e4dc3a23 (diff) | |
point other srcdirs to variable locations, so that Makefile.bsd-wrapper
can adjust them for the OpenBSD src tree.
Diffstat (limited to 'gnu/lib/libstdc++')
| -rw-r--r-- | gnu/lib/libstdc++/libstdc++/include/Makefile.in | 17 | ||||
| -rw-r--r-- | gnu/lib/libstdc++/libstdc++/libsupc++/Makefile.in | 9 |
2 files changed, 15 insertions, 11 deletions
diff --git a/gnu/lib/libstdc++/libstdc++/include/Makefile.in b/gnu/lib/libstdc++/libstdc++/include/Makefile.in index b6cc4515109..4fd661e12af 100644 --- a/gnu/lib/libstdc++/libstdc++/include/Makefile.in +++ b/gnu/lib/libstdc++/libstdc++/include/Makefile.in @@ -136,6 +136,7 @@ ifGNUmake = @ifGNUmake@ libio_la = @libio_la@ libtool_VERSION = @libtool_VERSION@ toplevel_srcdir = @toplevel_srcdir@ +GCC_SRCDIR=${toplevel_srcdir}/gcc AUTOMAKE_OPTIONS = 1.3 cygnus MAINT_CHARSET = latin1 @@ -679,31 +680,31 @@ ${target_builddir}/c++config.h: ${CONFIG_HEADER} \ < ${CONFIG_HEADER} >> $@ ;\ echo "#endif // _CPP_CPPCONFIG_" >>$@ -${target_builddir}/gthr.h: ${toplevel_srcdir}/gcc/gthr.h stamp-${target_alias} +${target_builddir}/gthr.h: $(GCC_SRCDIR)/gthr.h stamp-${target_alias} sed -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCPP_\1/g' \ -e 's,^#include "\(.*\)",#include <bits/\1>,g' \ - < ${toplevel_srcdir}/gcc/gthr.h > $@ + < $(GCC_SRCDIR)/gthr.h > $@ -${target_builddir}/gthr-single.h: ${toplevel_srcdir}/gcc/gthr-single.h \ +${target_builddir}/gthr-single.h: $(GCC_SRCDIR)/gthr-single.h \ stamp-${target_alias} sed -e 's/\(UNUSED\)/_GLIBCPP_\1/g' \ -e 's/\(GCC${uppercase}*_H\)/_GLIBCPP_\1/g' \ - < ${toplevel_srcdir}/gcc/gthr-single.h > $@ + < $(GCC_SRCDIR)/gthr-single.h > $@ -${target_builddir}/gthr-posix.h: ${toplevel_srcdir}/gcc/gthr-posix.h \ +${target_builddir}/gthr-posix.h: $(GCC_SRCDIR)/gthr-posix.h \ stamp-${target_alias} sed -e 's/\(UNUSED\)/_GLIBCPP_\1/g' \ -e 's/\(GCC${uppercase}*_H\)/_GLIBCPP_\1/g' \ -e 's/\(${uppercase}*WEAK\)/_GLIBCPP_\1/g' \ - < ${toplevel_srcdir}/gcc/gthr-posix.h > $@ + < $(GCC_SRCDIR)/gthr-posix.h > $@ -${target_builddir}/gthr-default.h: ${toplevel_srcdir}/gcc/${glibcpp_thread_h} \ +${target_builddir}/gthr-default.h: $(GCC_SRCDIR)/${glibcpp_thread_h} \ stamp-${target_alias} sed -e 's/\(UNUSED\)/_GLIBCPP_\1/g' \ -e 's/\(GCC${uppercase}*_H\)/_GLIBCPP_\1/g' \ -e 's/\(${uppercase}*WEAK\)/_GLIBCPP_\1/g' \ -e 's,^#include "\(.*\)",#include <bits/\1>,g' \ - < ${toplevel_srcdir}/gcc/${glibcpp_thread_h} > $@ + < $(GCC_SRCDIR)/${glibcpp_thread_h} > $@ install-data-local: $(mkinstalldirs) $(DESTDIR)${gxx_include_dir} $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${bits_builddir} diff --git a/gnu/lib/libstdc++/libstdc++/libsupc++/Makefile.in b/gnu/lib/libstdc++/libstdc++/libsupc++/Makefile.in index 843c7f44d8d..1c9e460143b 100644 --- a/gnu/lib/libstdc++/libstdc++/libsupc++/Makefile.in +++ b/gnu/lib/libstdc++/libstdc++/libsupc++/Makefile.in @@ -138,6 +138,9 @@ ifGNUmake = @ifGNUmake@ libio_la = @libio_la@ libtool_VERSION = @libtool_VERSION@ toplevel_srcdir = @toplevel_srcdir@ +GCC_SRCDIR=${toplevel_srcdir}/gcc +LIBIBERTY_INCLUDES=${toplevel_srcdir}/include +LIBIBERTY_SRCDIR=${toplevel_srcdir}/libiberty AUTOMAKE_OPTIONS = 1.3 cygnus MAINT_CHARSET = latin1 @@ -175,7 +178,7 @@ WARN_CXXFLAGS = \ # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES GLIBCPP_INCLUDES = @GLIBCPP_INCLUDES@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ -GCC_INCLUDES = -I$(toplevel_srcdir)/gcc -I$(toplevel_srcdir)/include +GCC_INCLUDES = -I$(GCC_SRCDIR) -I$(LIBIBERTY_INCLUDES) INCLUDES = \ $(GCC_INCLUDES) $(GLIBCPP_INCLUDES) $(LIBSUPCXX_INCLUDES) @@ -568,14 +571,14 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean cxa_demangle.c: rm -f $@ - $(LN_S) $(toplevel_srcdir)/libiberty/cp-demangle.c $@ + $(LN_S) $(LIBIBERTY_SRCDIR)/cp-demangle.c $@ cxa_demangle.lo: cxa_demangle.c $(LTCOMPILE) -DIN_GLIBCPP_V3 -Wno-error -c $< cxa_demangle.o: cxa_demangle.c $(C_COMPILE) -DIN_GLIBCPP_V3 -Wno-error -c $< dyn-string.c: rm -f $@ - $(LN_S) $(toplevel_srcdir)/libiberty/dyn-string.c $@ + $(LN_S) $(LIBIBERTY_SRCDIR)/dyn-string.c $@ dyn-string.lo: dyn-string.c $(LTCOMPILE) -DIN_GLIBCPP_V3 -Wno-error -c $< dyn-string.o: dyn-string.c |