diff options
| author | Thomas Bushnell, BSG <thomas@gnu.org> | 1996-08-30 23:40:22 +0000 |
|---|---|---|
| committer | Thomas Bushnell, BSG <thomas@gnu.org> | 1996-08-30 23:40:22 +0000 |
| commit | 924840c54244fe16223c42a91c36ca976784043b (patch) | |
| tree | e7090890ae159ec9938f3f545677408faba7fe88 /Rules | |
| parent | 6e953631df4b716fcf2d2bcfb62e44ffba2a6b40 (diff) | |
| download | glibc-924840c54244fe16223c42a91c36ca976784043b.tar.gz glibc-924840c54244fe16223c42a91c36ca976784043b.tar.xz glibc-924840c54244fe16223c42a91c36ca976784043b.zip | |
*** empty log message ***
Fri Aug 30 13:39:21 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * Makerules (BUILD_CFLAGS): Use @(common-objpfx) for config.h, not $(..). Some rules (like sysdeps/posix/Makefile for mk-stdiolim) do `cd' commands. (sed-remove-objpfx): Don't substitute for $(objpfx) anymore; $(common-objpfx) is good enough. * Rules (common-generated): Provide default (empty) value. (dummy.o, dummy.c, empty.o, empty.c): Put these in $(common-generated), not $(generated), and without $(..). (subdir_echo-distinfo): Treat $(common-generated) just like $(generated). (generated): Depend on the (suitably mutated) $(common-generated) files too. * Makerules (common-clean): Remove common-generated files too. * sysdeps/mach/hurd/Makefile (generated): Don't put errnos.d and stamp-errnos here. (common-generated): Do put errnos.d and stamp-errnos here. (rpath-link): Don't use +=; $(rpath-link) is a colon separated list. * sysdeps/mach/hurd/Makefile (before-compile): Add auth; also add auth to following rule to get it built. $(common-objpfx). All uses in dependency lists changed.
Diffstat (limited to 'Rules')
| -rw-r--r-- | Rules | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Rules b/Rules index a2010d657b..8d4f51fa79 100644 --- a/Rules +++ b/Rules @@ -49,6 +49,10 @@ ifneq "$(findstring env,$(origin generated))" "" generated := endif +ifneq "$(findstring env,$(origin common-generated))" "" +common-generated := +endif + ifeq "$(strip $(headers))" "" ifneq "$(wildcard $(subdir).h)" "" override headers := $(subdir).h @@ -71,7 +75,7 @@ $(common-objpfx)dummy.c: echo 'void __dummy__ () { }' > $@ $(common-objpfx)empty.c: cp -f /dev/null $@ -generated := $(generated) $(..)dummy.o $(..)dummy.c $(..)empty.c $(..)empty.o +common-generated := $(common-generated) dummy.o dummy.c empty.c empty.o # This makes all the auxilliary and test programs. @@ -117,7 +121,7 @@ subdir_echo-headers: echo-headers .PHONY: subdir_echo-distinfo subdir_echo-distinfo: @echo $(addprefix +header+,$(headers)) \ - $(addprefix +nodist+,$(generated) $(dont_distribute)) + $(addprefix +nodist+,$(generated) $(common-generated) $(dont_distribute)) # We want to install everything except the library itself, but update all # our portions of the library because the parent make will install it later @@ -131,7 +135,8 @@ subdir_dist: dist # Convenient target to update all the generated source files. .PHONY: generated -generated: $(addprefix $(objpfx),$(generated)) +generated: $(addprefix $(objpfx),$(generated)) +generated: $(addprefix $(common-objpfx),$(common-generated)) ifndef libc.so-version # Undefine this because it can't work when we libc.so is unversioned. |