From 09df8442f1cac14113bc05315ae0d965b1e957a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net> Date: Tue, 10 Feb 1998 16:42:13 -0800 Subject: [PATCH] now remakes automatically Rev: src/modules/Makefile.in:1.14 Rev: src/modules/dynamic_module_makefile.in:1.29 Rev: src/modules/static_module_makefile.in:1.23 --- src/modules/Makefile.in | 9 +++++++-- src/modules/dynamic_module_makefile.in | 5 +++-- src/modules/static_module_makefile.in | 5 +++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in index 192ad293b6..f63dde70bc 100644 --- a/src/modules/Makefile.in +++ b/src/modules/Makefile.in @@ -13,10 +13,15 @@ MAKE_FLAGS = "prefix=$(prefix)" "exec_prefix=$(exec_prefix)" "CC=$(CC)" "OTHERFL all: modules -modules: - for a in $(MODULES) ; do echo making $$a ; ( cd $$a ; $(MAKE) $(MAKE_FLAGS) MODNAME=$$a ) || exit $$? ; done +modules: $(MODULES) $(MAKE) linker_options modlist.h modlist_headers.h +force: + +$(MODULES) : force + @echo Making $@ + @( cd $@ ; rm remake >/dev/null 2>&1 || : ; $(MAKE) $(MAKE_FLAGS) MODNAME=$@ || ( test -f remake && $(MAKE) $(MAKE_FLAGS) MODNAME=$@ ) ) || exit $$? + modlist.h: $(MODULE_SEGMENTS) ( for a in $(MODULES) ; do cat $$a/modlist_segment ; done ; ) >modlist.h diff --git a/src/modules/dynamic_module_makefile.in b/src/modules/dynamic_module_makefile.in index 5b271c5c89..c9aa8f307c 100644 --- a/src/modules/dynamic_module_makefile.in +++ b/src/modules/dynamic_module_makefile.in @@ -1,5 +1,5 @@ # -# $Id: dynamic_module_makefile.in,v 1.28 1998/02/02 22:44:24 marcus Exp $ +# $Id: dynamic_module_makefile.in,v 1.29 1998/02/11 00:42:13 hubbe Exp $ # @@ -15,7 +15,7 @@ MAKE_FLAGS = "prefix=$(prefix)" "exec_prefix=$(exec_prefix)" "CC=$(CC)" "OTHERFL all: subdirs dummy subdirs: - for a in '' $(MODULE_SUBDIRS) ; do if test ! -z "$$a"; then echo making $$a ; ( cd $$a && $(MAKE) $(MAKE_FLAGS) ) || exit $$? ; else :; fi ; done + @for a in '' $(MODULE_SUBDIRS) ; do if test ! -z "$$a"; then echo making $$a ; ( cd $$a && $(MAKE) $(MAKE_FLAGS) ) || exit $$? ; else :; fi ; done dummy: $(DUMMY) linker_options modlist_headers modlist_segment module.so tmp="$(INSTALL_NAME)" ; \ @@ -34,6 +34,7 @@ modlist_segment: Makefile Makefile: ../dynamic_module_makefile $(SRCDIR)/Makefile.in $(SRCDIR)/dependencies CONFIG_FILES=Makefile CONFIG_HEADERS="" ./config.status + touch remake @echo "Run make again" @exit 1 diff --git a/src/modules/static_module_makefile.in b/src/modules/static_module_makefile.in index 79920891c9..8299806848 100644 --- a/src/modules/static_module_makefile.in +++ b/src/modules/static_module_makefile.in @@ -1,5 +1,5 @@ # -# $Id: static_module_makefile.in,v 1.22 1997/12/01 20:21:07 grubba Exp $ +# $Id: static_module_makefile.in,v 1.23 1998/02/11 00:42:13 hubbe Exp $ # @@ -15,7 +15,7 @@ MAKE_FLAGS = "prefix=$(prefix)" "exec_prefix=$(exec_prefix)" "CC=$(CC)" "OTHERFL all: subdirs dummy subdirs: - for a in '' $(MODULE_SUBDIRS) ; do if test ! -z "$$a"; then echo making $$a ; ( cd $$a && $(MAKE) $(MAKE_FLAGS) ) || exit $$? ; else :; fi ; done + @for a in '' $(MODULE_SUBDIRS) ; do if test ! -z "$$a"; then echo making $$a ; ( cd $$a && $(MAKE) $(MAKE_FLAGS) ) || exit $$? ; else :; fi ; done dummy: linker_options modlist_headers modlist_segment module.pmod module.a tmp="$(INSTALL_NAME)" ;\ @@ -34,6 +34,7 @@ modlist_segment: Makefile Makefile: ../static_module_makefile $(SRCDIR)/Makefile.in $(SRCDIR)/dependencies CONFIG_FILES=Makefile CONFIG_HEADERS="" ./config.status + touch remake @echo "Run make again" @exit 1 -- GitLab