X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=m4%2Fgengetopt%2Fmakefile;h=548a3d5d83bcb406a66dc26a77c0a840745d868f;hp=e1324115048f2c68ffdb6c929f27290973e8ea83;hb=650e5374914c1eb725ce7d2a720611bec22112bc;hpb=dddf554290fd65bd55b2b4d2cd796147d6df4712;ds=sidebyside

diff --git a/m4/gengetopt/makefile b/m4/gengetopt/makefile
index e1324115..548a3d5d 100644
--- a/m4/gengetopt/makefile
+++ b/m4/gengetopt/makefile
@@ -1,45 +1,20 @@
-module_ggo_opts := --set-version="($(PACKAGE_STRING), $(codename))"
-
-$(cmdline_dir)/%_recv.cmdline.h $(cmdline_dir)/%_recv.cmdline.c: $(ggo_dir)/%_recv.ggo | $(cmdline_dir)
-	@[ -z "$(Q)" ] || echo 'GGO $<'
-	$(Q) $(GENGETOPT) $(module_ggo_opts) \
-		--output-dir=$(cmdline_dir) \
-		--set-package=$(subst .ggo,,$(<F)) \
-		--arg-struct-name=$(subst .ggo,,$(<F))_args_info \
-		--file-name=$(subst .ggo,,$(<F)).cmdline \
-		--func-name $(subst .ggo,,$(<F))_cmdline_parser < $<
-
-$(cmdline_dir)/%_filter.cmdline.h $(cmdline_dir)/%_filter.cmdline.c: $(ggo_dir)/%_filter.ggo | $(cmdline_dir)
-	@[ -z "$(Q)" ] || echo 'GGO $<'
-	$(Q) $(GENGETOPT) $(module_ggo_opts) \
-		--output-dir=$(cmdline_dir) \
-		--set-package=$(subst .ggo,,$(<F)) \
-		--arg-struct-name=$(subst .ggo,,$(<F))_args_info \
-		--file-name=$(subst .ggo,,$(<F)).cmdline \
-		--func-name=$(subst _filter.ggo,,$(<F))_cmdline_parser < $<
-$(cmdline_dir)/%_write.cmdline.h $(cmdline_dir)/%_write.cmdline.c: $(ggo_dir)/%_write.ggo | $(cmdline_dir)
-	@[ -z "$(Q)" ] || echo 'GGO $<'
-	$(Q) $(GENGETOPT) -S $(module_ggo_opts) \
-		--output-dir=$(cmdline_dir) \
-		--set-package=$(subst .ggo,,$(<F)) \
-		--arg-struct-name=$(subst .ggo,,$(<F))_args_info \
-		--file-name=$(subst .ggo,,$(<F)).cmdline \
-		--func-name $(subst _write.ggo,,$(<F))_cmdline_parser < $<
-
-define ggo-opts
---conf-parser \
---output-dir=$(cmdline_dir) \
---no-handle-version \
---file-name=$(*F).cmdline \
---func-name=$(*F)_cmdline_parser \
---arg-struct-name=$(*F)_args_info \
---set-package="para_$(*F)" \
---set-version="$(PACKAGE_VERSION)"
+define ggo_opts
+	--output-dir=$(cmdline_dir) \
+	--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
 
+.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) < $<
+	$(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 \
@@ -57,12 +32,21 @@ $(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)/write.ggo: $(m4_ggo_dir)/loglevel.m4 \
+	$(m4_ggo_dir)/channels.m4 \
+	$(m4_ggo_dir)/sample_rate.m4 \
+	$(m4_ggo_dir)/sample_format.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
+$(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 $<'