X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=m4%2Fgengetopt%2Fmakefile;h=0db9d10e8a33d7fef84af8533fb7a6dbf545a421;hp=035f44a5df4360e0a68eabe55dd6598a589141e1;hb=5e8d8a8eea6de9459ebdf4498f9f061c84bfa63a;hpb=e249d1054762f7a3db4f04655dd662a221787a97

diff --git a/m4/gengetopt/makefile b/m4/gengetopt/makefile
index 035f44a5..0db9d10e 100644
--- a/m4/gengetopt/makefile
+++ b/m4/gengetopt/makefile
@@ -1,6 +1,6 @@
 define ggo_opts
 	--output-dir=$(cmdline_dir) \
-	--set-version="$(GIT_VERSION) ($(codename))" \
+	--set-version="$(GIT_VERSION)" \
 	--arg-struct-name=$(*F)_args_info \
 	--file-name=$(*F).cmdline \
 	--func-name=$(*F)_cmdline_parser \
@@ -13,15 +13,15 @@ $(cmdline_dir)/%.cmdline.h $(cmdline_dir)/%.cmdline.c: $(ggo_dir)/%.ggo | $(cmdl
 	@[ -z "$(Q)" ] || echo 'GGO $<'
 	$(Q) $(GENGETOPT) $(ggo_opts) < $<
 ifeq ($(ggo_descriptions_declared),no)
-	echo 'extern const char *$(*F)_args_info_description;' >> $(cmdline_dir)/$(*F).cmdline.h
+	@echo 'extern const char *$(*F)_args_info_description;' >> $(cmdline_dir)/$(*F).cmdline.h
 endif
 
 $(m4depdir)/%.m4d: $(m4_ggo_dir)/%.m4 | $(m4depdir)
 	@[ -z "$(Q)" ] || echo 'M4D $<'
-	$(Q) m4 -I $(m4_ggo_dir) --debug=i $< 3>&1 1>/dev/null 2>&3 \
-		| awk '{if ($$0 ~ "^m4debug: input read from ") \
-		print "$(ggo_dir)/$(*F).ggo: " $$NF}' > $@
+	$(Q) $(M4) -I $(m4_ggo_dir) -s $< \
+	| awk '{if ($$1 ~ /#line/) {gsub(/"/, "", $$3); if ($$3 != "$<") \
+	print "$(ggo_dir)/$(*F).ggo: " $$3}}' | sort | uniq > $@
 
 $(ggo_dir)/%.ggo: $(m4_ggo_dir)/%.m4 $(m4_ggo_dir)/header.m4 | $(ggo_dir)
 	@[ -z "$(Q)" ] || echo 'M4 $<'
-	$(Q) m4 -I $(m4_ggo_dir) $< > $@
+	$(Q) $(M4) -I $(m4_ggo_dir) $< > $@