build system: Do always regenerate version.o

We make two changes which affect only the litle recursive make of
version.o.  We only build version.o in the little sub-make when
relinking and then we want to always do it.  So the setting of OBJECTS
is pointless, and instead we make version.c depend on FORCE.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Subdir.sd.mk b/Subdir.sd.mk
index aad2f684e6f81ec4a3e6cec540d4903156e37816..93a8ac6ca6868c3eb08259df5f1dc1627d40d92c 100644 (file)
--- a/Subdir.sd.mk
+++ b/Subdir.sd.mk
@@ -61,7 +61,7 @@ TEST_OBJECTS:=eax-aes-test.o eax-serpent-test.o eax-serpentbe-test.o \
                eax-test.o aes.o
 
 ifeq (version.o,$(MAKECMDGOALS))
-OBJECTS:=version.o
+OBJECTS:=
 TEST_OBJECTS:=
 endif
 
@@ -129,7 +129,8 @@ recheck:
        rm -rf $(addsuffix /d-*, $(TESTDIRS))
        $(MAKE) check
 
-version.c: Makefile
+.PHONY: FORCE
+version.c: FORCE
        echo "#include \"secnet.h\"" >$@.new
        @set -ex; if test -e .git && type -p git >/dev/null; then \
                v=$$(git describe --match 'v*'); v=$${v#v}; \