X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=m4%2Fgengetopt%2Fmakefile;h=79e101a3e4e88f3e55b096b90780615b82b2e602;hp=c81eda46dfa1816048133f20868322b769ea7296;hb=79e5bc5e10700719b8a605f993e6e5c35307f0e8;hpb=00583bed658c70aacf2a94532904fd403c5ee7f1;ds=sidebyside

diff --git a/m4/gengetopt/makefile b/m4/gengetopt/makefile
index c81eda46..79e101a3 100644
--- a/m4/gengetopt/makefile
+++ b/m4/gengetopt/makefile
@@ -1,39 +1,26 @@
 define ggo_opts
 	--output-dir=$(cmdline_dir) \
-	--set-version="$(PACKAGE_VERSION)" \
+	--set-version="$(GIT_VERSION)" \
 	--arg-struct-name=$(*F)_args_info \
 	--file-name=$(*F).cmdline \
 	--func-name=$(*F)_cmdline_parser \
 	--set-package="para_$(*F)"
 endef
 
+.PRECIOUS: $(cmdline_dir)/%.cmdline.c $(cmdline_dir)/%.cmdline.h $(ggo_dir)/%.ggo
+
 $(cmdline_dir)/%.cmdline.h $(cmdline_dir)/%.cmdline.c: $(ggo_dir)/%.ggo | $(cmdline_dir)
 	@[ -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
+endif
 
-$(ggo_dir)/server.ggo $(ggo_dir)/audiod.ggo: \
-	$(m4_ggo_dir)/loglevel.m4 $(m4_ggo_dir)/color.m4 \
-	$(m4_ggo_dir)/config_file.m4 $(m4_ggo_dir)/logfile.m4 \
-	$(m4_ggo_dir)/daemon.m4 $(m4_ggo_dir)/user.m4 \
-	$(m4_ggo_dir)/group.m4 $(m4_ggo_dir)/log_timing.m4 \
-	$(m4_ggo_dir)/config_file.m4
-
-$(ggo_dir)/afh.ggo: $(m4_ggo_dir)/loglevel.m4
-$(ggo_dir)/audioc.ggo: \
-	$(m4_ggo_dir)/loglevel.m4 \
-	$(m4_ggo_dir)/history_file.m4 \
-	$(m4_ggo_dir)/complete.m4
-$(ggo_dir)/filter.ggo: $(m4_ggo_dir)/loglevel.m4
-$(ggo_dir)/fsck.ggo: $(m4_ggo_dir)/loglevel.m4
-$(ggo_dir)/gui.ggo: $(m4_ggo_dir)/loglevel.m4 $(m4_ggo_dir)/config_file.m4
-$(ggo_dir)/recv.ggo: $(m4_ggo_dir)/loglevel.m4
-$(ggo_dir)/write.ggo: $(m4_ggo_dir)/loglevel.m4
-$(ggo_dir)/client.ggo: \
-	$(m4_ggo_dir)/loglevel.m4 \
-	$(m4_ggo_dir)/config_file.m4 \
-	$(m4_ggo_dir)/history_file.m4 \
-	$(m4_ggo_dir)/complete.m4
-$(ggo_dir)/fade.ggo: $(m4_ggo_dir)/loglevel.m4 $(m4_ggo_dir)/config_file.m4
+$(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}' > $@
 
 $(ggo_dir)/%.ggo: $(m4_ggo_dir)/%.m4 $(m4_ggo_dir)/header.m4 | $(ggo_dir)
 	@[ -z "$(Q)" ] || echo 'M4 $<'