diff options
| author | Thomas Bushnell <thomas@gnu.org> | 1998-07-07 18:35:04 +0000 |
|---|---|---|
| committer | Thomas Bushnell <thomas@gnu.org> | 1998-07-07 18:35:04 +0000 |
| commit | 8681d2dd187f677357f78a1b151bb617284ab43b (patch) | |
| tree | 47d5d60f3c175b7847e6b134af73e93dadd1ab13 | |
| parent | 504ce7c49946e9455b3df28c2137887648d604a8 (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).
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Makeconf | 19 |
2 files changed, 9 insertions, 19 deletions
@@ -1,11 +1,8 @@ Tue Jul 7 11:39:08 1998 Thomas Bushnell, n/BSG <tb@mit.edu> - * Makeconf (%.o): New rules (from %.c and %.S) so that we can - specify file-specific CPPFLAGS (already in use by utils/Makefile - for utils/ping.c). - (%_pic.o, $_p.o, make-deps): Also grok file-specific CPPFLAGS. - Reported by Gordon Matzigkeit (gord@gnu.org). - + * Makeconf (CPPFLAGS): Include $($*-CPPFLAGS). Reported by Gordon + Matzigkeit (gord@gnu.org). + * INSTALL-cross: Updated by Gordon Matzigkeit (gord@gnu.org). 1998-04-02 Gordon Matzigkeit <gord@profitpress.com> @@ -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 $@ |