X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=06c86eb622247a2944f26a762e6f0986cdc2fe25;hp=3fbbce21ab5f3fe91d674750a4d3f7804c346188;hb=be9f7c9b442f7b723427a79f85774d5fa7718425;hpb=fd00054b1c8f06dd80b4d26762141902449c5fc7

diff --git a/Makefile.in b/Makefile.in
index 3fbbce21..06c86eb6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,6 +16,8 @@ uname_rs := $(shell uname -rs)
 cc_version := $(shell $(CC) --version | head -n 1)
 codename := deterministic entropy
 
+GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h)
+
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
 # produces false positives
@@ -59,7 +61,6 @@ CPPFLAGS += @arch_cppflags@
 CPPFLAGS += -I/usr/local/include
 CPPFLAGS += -I$(cmdline_dir)
 CPPFLAGS += @osl_cppflags@
-CPPFLAGS += -DGIT_VERSION='"$(GIT_VERSION)"'
 
 man_pages := $(patsubst %, man/man1/%.1, @executables@)
 man_pages_in := $(patsubst %, web/%.man.in.html, @executables@)
@@ -99,17 +100,12 @@ else
 	Q = @
 endif
 
-.PHONY: all clean distclean maintainer-clean install man tarball\
-	.FORCE-GIT-VERSION-FILE
-all: @executables@ $(man_pages)
+.PHONY: dep all clean distclean maintainer-clean install man tarball
+all: dep @executables@ $(man_pages)
+dep: $(deps)
 man: $(man_pages)
 tarball: $(tarball)
 
-GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
-	@./GIT-VERSION-GEN GIT-VERSION-FILE
--include GIT-VERSION-FILE
-@executables@: GIT-VERSION-FILE
-
 -include $(ggo_dir)/makefile
 
 %_command_list.c: %.cmd
@@ -224,8 +220,10 @@ all_objs := $(recv_objs) $(filter_objs) $(client_objs) $(gui_objs) \
 	$(audiod_objs) $(audioc_objs) $(fade_objs) $(server_objs) \
 	$(write_objs) $(afh_objs)
 
+deps := $(all_objs:.o=.d)
+
 ifeq ($(findstring clean, $(MAKECMDGOALS)),)
--include $(all_objs:.o=.d)
+-include $(deps)
 endif
 
 para_recv: $(recv_objs)
@@ -300,7 +298,7 @@ $(tarball): $(cmdline_generated)
 	git archive --format=tar --prefix=$(tarball_pfx)/ HEAD \
 		| tar --delete $(tarball_delete) > $(tarball_pfx).tar
 	mkdir -p $(tarball_pfx)/$(cmdline_dir)
-	echo $(GIT_VERSION) > $(tarball_pfx)/VERSION
+	./GIT-VERSION-GEN > $(tarball_pfx)/VERSION
 	cp -r $(autocrap) $(tarball_pfx)
 	cp -r $(cmdline_generated) $(tarball_pfx)/$(cmdline_dir)
 	tar rf $(tarball_pfx).tar $(tarball_pfx)/*