X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=m4%2Fgengetopt%2Fmakefile;h=c816bd74ad8669b469417144e9aa01f13bdd6589;hp=c3b42f441ffa4b445c193849180b51404c0d0009;hb=b59e0eeefe6b51a26c1165f587bf3776369460a5;hpb=0eb69b6d45c54deda1724b2db2202cf4057b0309

diff --git a/m4/gengetopt/makefile b/m4/gengetopt/makefile
index c3b42f44..c816bd74 100644
--- a/m4/gengetopt/makefile
+++ b/m4/gengetopt/makefile
@@ -1,15 +1,20 @@
 define ggo_opts
 	--output-dir=$(cmdline_dir) \
-	--set-version="$(PACKAGE_VERSION)" \
+	--set-version="$(GIT_VERSION) ($(codename))" \
 	--arg-struct-name=$(*F)_args_info \
 	--file-name=$(*F).cmdline \
 	--func-name=$(*F)_cmdline_parser \
 	--set-package="para_$(*F)"
 endef
 
-$(cmdline_dir)/%.cmdline.h $(cmdline_dir)/%.cmdline.c: $(ggo_dir)/%.ggo | $(cmdline_dir)
+.PRECIOUS: $(cmdline_dir)/%.cmdline.c $(cmdline_dir)/%.cmdline.h $(ggo_dir)/%.ggo
+
+$(cmdline_dir)/%.cmdline.h $(cmdline_dir)/%.cmdline.c: $(ggo_dir)/%.ggo git-version.h | $(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 \
@@ -41,6 +46,8 @@ $(ggo_dir)/resample_filter.ggo: \
 	$(m4_ggo_dir)/channels.m4 \
 	$(m4_ggo_dir)/sample_rate.m4 \
 	$(m4_ggo_dir)/sample_format.m4
+$(ggo_dir)/play.ggo: $(m4_ggo_dir)/loglevel.m4 $(m4_ggo_dir)/config_file.m4
+
 $(ggo_dir)/%.ggo: $(m4_ggo_dir)/%.m4 $(m4_ggo_dir)/header.m4 | $(ggo_dir)
 	@[ -z "$(Q)" ] || echo 'M4 $<'
 	$(Q) m4 -I $(m4_ggo_dir) $< > $@