From efc335d4a1ca4e6c5ca345e3a30f9db265d0b3d2 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 11 Jun 1992 05:33:52 +0000 Subject: Formerly GNUmakefile.~64~ --- GNUmakefile | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 3b48af0..8f6e2d4 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -49,7 +49,9 @@ $(archpfx)remote.o: remote.c $(archpfx)remote.dep: remote.c $(mkdep) $(REMOTE) $< | sed 's,$*\.o,& $@,' > $@ +ifneq "$(defines)" "@DEFS@" CPPFLAGS = $(defines) +endif ifneq "$(wildcard $(ARCH)/makefile)" "" include $(ARCH)/makefile @@ -69,13 +71,11 @@ ifneq ($(wildcard $(libc_dir)/works-for-make),) # $(libc_dir)/lib/libc.a CC := $(CC) -b glibc -# glob is in the C library. -globdep = $(libc_dir)/lib/libc.a -globlib = - -# So is getopt. +# getopt is in libc. GETOPT = +CPPFLAGS := -DSTDC_HEADERS -DHAVE_UNISTD_H -DHAVE_GLOB_H + else globdep = glob/libglob.a @@ -148,7 +148,7 @@ remote.dep: remote.c endif nolib-deps = $(patsubst $(archpfx)%,%,$(depfiles)) endif -Makefile: compatMakefile $(nolib-deps) +Makefile.in: compatMakefile $(nolib-deps) (cat $<; \ echo '# Automatically generated dependencies.'; \ sed -e 's/ [^ ]*\.dep//' -e 's=$(archpfx)==' $(filter-out $<,$^) \ @@ -173,6 +173,10 @@ testdir := $(shell ls -d1 make-test-?.? | sort -n +0.10 -0.11 +0.12 | tail -1l) tests: $(testdir)/run_make_tests.pl $(prog) cd $(