summaryrefslogtreecommitdiff
path: root/Makeconf
diff options
context:
space:
mode:
authorThomas Bushnell <thomas@gnu.org>1998-07-07 18:35:04 +0000
committerThomas Bushnell <thomas@gnu.org>1998-07-07 18:35:04 +0000
commit8681d2dd187f677357f78a1b151bb617284ab43b (patch)
tree47d5d60f3c175b7847e6b134af73e93dadd1ab13 /Makeconf
parent504ce7c49946e9455b3df28c2137887648d604a8 (diff)
Revert last change and replace it with
Tue Jul 7 11:39:08 1998 Thomas Bushnell, n/BSG <tb@mit.edu> * Makeconf (CPPFLAGS): Include $($*-CPPFLAGS). Reported by Gordon Matzigkeit (gord@gnu.org).
Diffstat (limited to 'Makeconf')
-rw-r--r--Makeconf19
1 files changed, 6 insertions, 13 deletions
diff --git a/Makeconf b/Makeconf
index 00e076f7..7f69235b 100644
--- a/Makeconf
+++ b/Makeconf
@@ -69,7 +69,7 @@ top_srcdirinc=
else
top_srcdirinc=-I$(top_srcdir)
endif
-CPPFLAGS += -I. $(srcdirinc) -I.. $(top_srcdirinc) -I$(top_srcdir)/include -D_GNU_SOURCE
+CPPFLAGS += -I. $(srcdirinc) -I.. $(top_srcdirinc) -I$(top_srcdir)/include -D_GNU_SOURCE $($*-CPPFLAGS)
CFLAGS += -Wall -g -O3
# More useful version of HURDLIBS
@@ -349,26 +349,19 @@ relink:
vpath libutil.% $(libdir)/
-# Default rules to build standard object files.
-%.o: %.c
- $(COMPILE.c) $($*-CPPFLAGS) $< -o $@
-
-%.o: %.S
- $(COMPILE.S) $($*-CPPFLAGS) $< -o $@
-
# Default rules to build PIC object files.
%_pic.o: %.c
- $(COMPILE.c) $($*-CPPFLAGS) $< -DPIC -fPIC -o $@
+ $(COMPILE.c) $< -DPIC -fPIC -o $@
%_pic.o: %.S
- $(COMPILE.S) $($*-CPPFLAGS) $< -DPIC -o $@
+ $(COMPILE.S) $< -DPIC -o $@
# Default rules to build profiled object files.
%_p.o: %.c
- $(COMPILE.c) $($*-CPPFLAGS) $< -DPROF -pg -o $@
+ $(COMPILE.c) $< -DPROF -pg -o $@
%_p.o: %.S
- $(COMPILE.S) $($*-CPPFLAGS) $< -DPROF -o $@
+ $(COMPILE.S) $< -DPROF -o $@
# How to build RPC stubs
@@ -473,7 +466,7 @@ $(target): %: FORCE
endif
define make-deps
-set -e; $(CC) $(CFLAGS) $(CPPFLAGS) $($*-CPPFLAGS) -M -MG $< | \
+set -e; $(CC) $(CFLAGS) $(CPPFLAGS) -M -MG $< | \
sed > $@.new -e 's/$*\.o:/$*.o $*_pic.o $*_p.o $@:/' \
-e 's% [^ ]*/gcc-lib/[^ ]*\.h%%g'
mv -f $@.new $@