From 3bbceb1287e3df7eb75e7a9852278d4eb9d33a00 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 31 Oct 1995 06:54:40 +0000 Subject: Tue Oct 31 00:07:29 1995 Roland McGrath * sysdeps/mach/hurd/group_member.c: New file. * sysdeps/generic/group_member.c: New file. * Makerules (lib-noranlib): Don't depend on $(install-lib). (others): Do. * extra-lib.mk: Fix test of $(lib)-no-lib-dep. Mon Oct 30 12:33:10 1995 Roland McGrath * Rules (others): Depend on $(extra-objs). * posix/unistd.h [__USE_GNU]: Declare group_member, __group_member. * posix/Makefile (routines): Add group_member. * sysdeps/posix/euidaccess.c: New file, adapted from fileutils. * sysdeps/unix/sysv/linux/i386/sigaction.c: Tighten constraint for SIG operand in asm so it must be a register. Add dead return to quiet gcc warning. * Makerules (sysd-rules): Write a defn for sysd-rules-done. [! sysd-rules-done]: Inhibit deps. --- Makerules | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'Makerules') diff --git a/Makerules b/Makerules index ce05017e4d..ac07369998 100644 --- a/Makerules +++ b/Makerules @@ -75,11 +75,6 @@ vpath %.h $(subst $(empty) ,:,$(strip $(common-objpfx) \ $(addprefix $(sysdep_dir)/,$(sysdirs)) \ $(..))) -ifeq ($(wildcard $(+sysdir_pfx)sysd-Makefile),) -# Don't do deps until this exists, because it might change the sources list. -no_deps=t -endif - # Some sysdep makefiles use this to distinguish being included here from # being included individually by a subdir makefile (hurd/Makefile needs this). in-Makerules := yes @@ -104,6 +99,12 @@ $(+sysdir_pfx)sysd-Makefile: $(+sysdir_pfx)config.make $(..)Makerules \ 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 +endif + + # Reorder before-compile so that mach things come first, and hurd things # second, before all else. The mach and hurd subdirectories have many # generated header files which the much of rest of the library depends on, @@ -231,9 +232,16 @@ $(+sysdir_pfx)sysd-rules: $(+sysdir_pfx)config.make $(..)Makerules \ $(close-check-inhibit-asm) \ echo "\$$(objpfx)%.d: $$dir/%.c \$$(before-compile); \ \$$(+make-deps)"; \ - done) > $@T + done; \ + echo 'sysd-rules-done = t') > $@T mv -f $@T $@ +ifndef sysd-rules-done +# Don't do deps until this exists, because it provides rules to make the deps. +no_deps=t +endif + + ifndef compile-command.S compile-command.S = $(compile.S) $(OUTPUT_OPTION) endif @@ -344,7 +352,8 @@ lib%.a: lib%.a(__.SYMDEF) ; libobjs: $(foreach o,$(object-suffixes),\ $(common-objpfx)$(patsubst %,$(libtype$o),c)(\ $(notdir $(objects:.o=$o)))) -lib-noranlib: libobjs $(addprefix $(objpfx),$(install-lib)) +lib-noranlib: libobjs +others: $(addprefix $(objpfx),$(install-lib)) ifdef objects -- cgit v1.2.3