diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-05-13 11:32:49 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-05-13 11:32:49 +0000 |
| commit | 7765329deea9c86c7517097653a087af30c7bd9f (patch) | |
| tree | 9c9b7d3cd474c162fa2b9b9beb60c5db3277d8c7 /gnu/lib | |
| parent | 6b3352d4addbff179912915ad004947505e67434 (diff) | |
Don't do PREREQ's when making obj.
Diffstat (limited to 'gnu/lib')
| -rw-r--r-- | gnu/lib/libg++/libiberty/Makefile.bsd-wrapper | 4 | ||||
| -rw-r--r-- | gnu/lib/libg++/libstdc++/Makefile.bsd-wrapper | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/gnu/lib/libg++/libiberty/Makefile.bsd-wrapper b/gnu/lib/libg++/libiberty/Makefile.bsd-wrapper index 24ffed2ab11..45a83d24765 100644 --- a/gnu/lib/libg++/libiberty/Makefile.bsd-wrapper +++ b/gnu/lib/libg++/libiberty/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.3 1996/03/28 07:31:07 etheisen Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.4 1996/05/13 11:32:30 niklas Exp $ LIB= iberty CPPFLAGS+= -I$(.CURDIR) -I$(.CURDIR)/../include -I$(.OBJDIR) @@ -8,11 +8,13 @@ CPPFLAGS+= -I$(.CURDIR) -I$(.CURDIR)/../include -I$(.OBJDIR) # we must first see to that they are really generated. This is a hack that # ensures this. The echo at the end is because make doesn't like command # substitutions to not generate output. +.ifnmake obj PREREQ!= test ! -f $(.OBJDIR)/needed-list && \ (cd $(.CURDIR); \ $(MAKE) -f Makefile.bsd-wrapper1); \ echo 'Prerequistes made' HOST_FILES!= cat $(.OBJDIR)/needed-list +.endif SRCS= argv.c basename.c concat.c cplus-dem.c fdmatch.c \ getopt.c getopt1.c getruntime.c hex.c \ diff --git a/gnu/lib/libg++/libstdc++/Makefile.bsd-wrapper b/gnu/lib/libg++/libstdc++/Makefile.bsd-wrapper index 260171bdddd..fe7683af593 100644 --- a/gnu/lib/libg++/libstdc++/Makefile.bsd-wrapper +++ b/gnu/lib/libg++/libstdc++/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.4 1996/03/28 07:31:10 etheisen Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.5 1996/05/13 11:32:48 niklas Exp $ LIB= stdc++ CXXFLAGS+= -fno-implicit-templates -nostdinc++ @@ -41,6 +41,7 @@ LIBIBERTY_OBJDIR!=if [ -d $(LIBIBERTY_DIR)/$(OBJDIR) ]; then \ # we must first see to that they are really generated. This is a hack that # ensures this. The echo at the end is because make doesn't like command # substitutions to not generate output. +.ifnmake obj PREREQ!= test ! -f $(IO_OBJDIR)/iostream.list && \ (cd $(IO_DIR); \ make -f Makefile.bsd-wrapper iostream.list); \ @@ -49,7 +50,6 @@ PREREQ!= test ! -f $(IO_OBJDIR)/iostream.list && \ make -f Makefile.bsd-wrapper needed-list); \ echo 'Prerequistes made' - IO_OBJS!= cat $(IO_OBJDIR)/iostream.list QIO_OBJS= $(IO_OBJS:S/^/$(IO_OBJDIR)\//g) @@ -58,6 +58,7 @@ LIBIBERTY_OBJS=$(LIBIBERTY_SRCS:N*.h:R:S/$/.o/g) # XXX why does strerror.o need to be hardwired? LIBIBERTY_OBJS+=strerror.o QLIBIBERTY_OBJS=$(LIBIBERTY_OBJS:S/^/$(LIBIBERTY_OBJDIR)\//g) +.endif STL_OBJDIR!= if [ -d $(STL_DIR)/$(OBJDIR) ]; then \ echo $(STL_DIR)/$(OBJDIR); \ |