summaryrefslogtreecommitdiff
path: root/Makeconf
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2012-04-08 23:09:14 +0200
committerThomas Schwinge <thomas@codesourcery.com>2012-04-08 23:09:14 +0200
commit94a3d5a0b5591ef065f86912948a79cf8b007b13 (patch)
treeed2eeb2df1dca5c105703339f1dced353769605a /Makeconf
parent7d5a62da64c0f1a61fb2ea7b0e76950e12b422cd (diff)
Automatically regenerate files that depend on $(hurd-version).
Follow-up to 05f5cc229323a61799388fbb52da84ca8cb502c9 (»configure: Use modern `AC_INIT' invocation.«). * Makeconf (%: %.sh): Depend on config.make. * Makefile (version.h): Use a stamp file. (stamp-version): Depend on config.make. * doc/Makefile (stamp-version): Likewise. * Makeconf (make-deps): Take additional target-specific dependencies, $*-DEPS. * console-client/Makefile (driver-DEPS): Depend on config.make. * libstore/Makefile (module-DEPS): Likewise.
Diffstat (limited to 'Makeconf')
-rw-r--r--Makeconf7
1 files changed, 3 insertions, 4 deletions
diff --git a/Makeconf b/Makeconf
index 8ff85241..538202cb 100644
--- a/Makeconf
+++ b/Makeconf
@@ -121,8 +121,7 @@ library_deps=$(foreach lib,$(HURDLIBS),$(..)lib$(lib)/lib$(lib).so)
# Local programs:
MKINSTALLDIRS = $(top_srcdir)/mkinstalldirs
-
-
+move-if-change = $(SHELL) $(top_srcdir)/move-if-change
# Decode makemode.
# After this section, $(targets) and $(progtarg) will be defined,
@@ -618,7 +617,7 @@ endif
define make-deps
set -e; $(CC) $(CFLAGS) $(CPPFLAGS) -M -MG $< | \
-sed > $@.new -e 's/$*\.o:/$*.o $*_pic.o $*_p.o $@:/' \
+sed > $@.new -e 's%$*\.o:%$*.o $*_pic.o $*_p.o $@: $($*-DEPS)%' \
-e 's% [^ ]*/gcc-lib/[^ ]*\.h%%g'
mv -f $@.new $@
endef
@@ -636,6 +635,6 @@ endef
echo '$*.o: $<' > $@
# Rule to make executable shell scripts from .sh files.
-%: %.sh
+%: %.sh $(..)config.make
sed -e 's/STANDARD_HURD_VERSION_\(.[^_]*\)_/\1 (GNU Hurd) $(hurd-version)/' < $< > $@
chmod +x $@