summaryrefslogtreecommitdiff
path: root/Makerules
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2001-05-14 23:32:39 +0000
committerRoland McGrath <roland@gnu.org>2001-05-14 23:32:39 +0000
commit083973f34e1c70e05e117db37239716995127cfd (patch)
tree1cbd8c5608a168b06bc8d8a8278cf0a9ab08e08e /Makerules
parentaefdff34cd2669d3bb3824a759ce0322ed7e2ef2 (diff)
downloadglibc-083973f34e1c70e05e117db37239716995127cfd.tar.gz
* csu/Makefile ($(objpfx)g$(start-installed-name)): Turn this into a
static pattern rule also that also covers $(objpx)g$(static-start-installed-name). [$(start-installed-name) != $(static-start-installed-name)] (extra-objs, omit-deps, install-lib): Add $(static-start-installed-name) and g$(static-start-installed-name). * sysdeps/mach/hurd/i386/Makefile: Don't add crt0.o to those here; just setting static-start-installed-name is now sufficient. (extra-objs): Add static-start.o here. (CFLAGS-initfini.s): Remove obsolete variable. * sysdeps/mach/hurd/i386/Makeconfig: New file. Define static-start-installed-name here. * Makeconfig: Include existing $(full_config_sysdirs:=/Makeconfig). * Make-dist (+sysdep-tsrcs): Look for Makeconfig files. * Makerules ($(+sysdir_pfx)sysd-Makefile): Remove this target and associated hair. Instead, just use $(wildcard ...) in the include. * configure.in (critic_missing, aux_missing): Collect in these vars the names of the missing programs, and include them in the error msgs. * configure: Regenerated.
Diffstat (limited to 'Makerules')
-rw-r--r--Makerules30
1 files changed, 3 insertions, 27 deletions
diff --git a/Makerules b/Makerules
index 485b5c035c..53d82c0204 100644
--- a/Makerules
+++ b/Makerules
@@ -94,28 +94,9 @@ vpath %.x $(subst $(empty) ,:,$(strip $(common-objpfx) $(objpfx) \
# being included individually by a subdir makefile (hurd/Makefile needs this).
in-Makerules := yes
--include $(+sysdir_pfx)sysd-Makefile
-ifndef avoid-generated
-ifneq ($(sysd-Makefile-sysdirs),$(config-sysdirs))
-sysd-Makefile-force = FORCE
-FORCE:
-endif
-$(+sysdir_pfx)sysd-Makefile: $(+sysdir_pfx)config.make $(..)Makerules \
- $(sysd-Makefile-force)
- -@rm -f $@T
- (echo 'sysd-Makefile-sysdirs := $(config-sysdirs)'; \
- for file in $(config-sysdirs:=/Makefile); do \
- if [ -f $(..)$$file ]; then \
- echo include "\$$(..)$$file"; \
- else true; fi; \
- done; \
- echo 'sysd-Makefile-done=t') > $@T
- mv -f $@T $@
-endif
-
-ifndef sysd-Makefile-done
-# Don't do deps until this exists, because it might change the sources list.
-no_deps=t
+sysdep-makefiles := $(wildcard $(full_config_sysdirs:=/Makefile))
+ifneq (,$(sysdep-makefiles))
+include $(sysdep-makefiles)
endif
@@ -230,10 +211,6 @@ endef
close-check-inhibit-asm = ;; esac ;
endif
-# Don't include sysd-rules until sysd-Makefile is already there and has been
-# included. It might define inhibit-sysdep-asm, which would affect the
-# contents of sysd-rules.
-ifdef sysd-Makefile-done
-include $(+sysdir_pfx)sysd-rules
ifneq ($(sysd-rules-sysdirs),$(config-sysdirs))
# The value of $(+sysdep_dirs) the sysd-rules was computed for
@@ -241,7 +218,6 @@ ifneq ($(sysd-rules-sysdirs),$(config-sysdirs))
sysd-rules-force = FORCE
FORCE:
endif
-endif
$(+sysdir_pfx)sysd-rules: $(+sysdir_pfx)config.make $(..)Makerules \
$(wildcard $(foreach dir,$(sysdirs),\
$(dir)/Makefile))\