X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=Makefile.in;h=834e446352d7d256ad816a1524faf0006d9896ea;hb=e2213f2468eb1c6f8ca033c6529ee1b5ceadab7f;hp=42ab70ec0ad22a5d29af33e66715005e7d4f861f;hpb=f4fb0289834e76a23839719ab0e89fe29b591d3f;p=paraslash.git

diff --git a/Makefile.in b/Makefile.in
index 42ab70ec..834e4463 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -114,27 +114,28 @@ play_objs = play.cmdline.o play.o time.o
 include Makefile.deps
 
 V := ($(TGZ_PREFIX)@PACKAGE_STRING@, $(codename))\n$(COPYRIGHT)\n$(DISCLAIMER)
-module_ggo_opts := --set-version="" --set-package=""
+module_ggo_opts := --set-version="(@PACKAGE_STRING@, $(codename))"
 
 grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
 	gengetopt $(module_ggo_opts) \
-		--no-handle-error \
+		--set-package=grab \
 		--no-handle-help \
+		--no-handle-error \
+		--no-handle-version \
 		--arg-struct-name=grab_client_args_info \
 		--file-name=$(subst .ggo,,$<).cmdline \
 		--func-name $(subst .ggo,,$<)_cmdline_parser < $<
-	grep -v 'fprintf\ *(stderr' $(subst .ggo,,$<).cmdline.c > $(subst .ggo,,$<).tmp
-	mv $(subst .ggo,,$<).tmp $(subst .ggo,,$<).cmdline.c
-	ggo_help GRAB_HELP_TXT < grab_client.ggo >> $(subst .ggo,,$<).cmdline.h
 
 %_recv.cmdline.h %_recv.cmdline.c: %_recv.ggo
 	gengetopt $(module_ggo_opts) \
+		--set-package=$(subst .ggo,,$<) \
 		--arg-struct-name=$(subst .ggo,,$<)_args_info \
 		--file-name=$(subst .ggo,,$<).cmdline \
 		--func-name $(subst .ggo,,$<)_cmdline_parser < $<
 
 %_filter.cmdline.h %_filter.cmdline.c: %_filter.ggo
 	gengetopt $(module_ggo_opts) \
+		--set-package=$(subst .ggo,,$<) \
 		--arg-struct-name=$(subst .ggo,,$<)_args_info \
 		--file-name=$(subst .ggo,,$<).cmdline \
 		--func-name $(subst _filter.ggo,,$<)_cmdline_parser < $<