X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ggo%2Fmakefile;h=bcc172b204855ca037a04bf4bfd9269f581eab69;hp=d4f3a8cd2d212b281aff3c4282bb9e497a3c3297;hb=b307a25ed895caa33684302b502e9e0e70dc78b7;hpb=fae6ed3cc6d240eefcc111bdd04f637e3cda5dd0

diff --git a/ggo/makefile b/ggo/makefile
index d4f3a8cd..bcc172b2 100644
--- a/ggo/makefile
+++ b/ggo/makefile
@@ -4,7 +4,7 @@ $(cmdline_dir):
 
 $(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) \
+	$(Q) $(GENGETOPT) $(module_ggo_opts) \
 		--output-dir=$(cmdline_dir) \
 		--set-package=$(subst .ggo,,$(<F)) \
 		--arg-struct-name=$(subst .ggo,,$(<F))_args_info \
@@ -13,7 +13,7 @@ $(cmdline_dir)/%_recv.cmdline.h $(cmdline_dir)/%_recv.cmdline.c: $(ggo_dir)/%_re
 
 $(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) \
+	$(Q) $(GENGETOPT) $(module_ggo_opts) \
 		--output-dir=$(cmdline_dir) \
 		--set-package=$(subst .ggo,,$(<F)) \
 		--arg-struct-name=$(subst .ggo,,$(<F))_args_info \
@@ -21,7 +21,7 @@ $(cmdline_dir)/%_filter.cmdline.h $(cmdline_dir)/%_filter.cmdline.c: $(ggo_dir)/
 		--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) \
+	$(Q) $(GENGETOPT) -S $(module_ggo_opts) \
 		--output-dir=$(cmdline_dir) \
 		--set-package=$(subst .ggo,,$(<F)) \
 		--arg-struct-name=$(subst .ggo,,$(<F))_args_info \
@@ -29,6 +29,7 @@ $(cmdline_dir)/%_write.cmdline.h $(cmdline_dir)/%_write.cmdline.c: $(ggo_dir)/%_
 		--func-name $(subst _write.ggo,,$(<F))_cmdline_parser < $<
 
 define ggo-opts
+$(if $(filter gui,$(*F)), --no-handle-error) \
 $(if $(filter recv filter write audiod,$(*F)), --no-handle-help) \
 $(if $(filter afh,$(*F)), --unamed-opts=audio_file) \
 $(if $(filter client audioc,$(*F)), --unamed-opts=command) \
@@ -44,7 +45,7 @@ endef
 
 $(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) < $<
 
 $(ggo_dir)/server.ggo $(ggo_dir)/audiod.ggo: \
 	$(ggo_dir)/loglevel.m4 $(ggo_dir)/color.m4 \