From: Andre <maan@p133.(none)>
Date: Mon, 27 Mar 2006 05:42:20 +0000 (+0200)
Subject: gengetopt improvements
X-Git-Tag: v0.2.12~124
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=68f5f7bdb30e7adcb87d0f314c67f0f80b337306

gengetopt improvements

Use the --set-package option of gengetopts for receivers, filters
and the grab command, and set the 'package' name appropriately.
Moreover, --no-handle-version is needed for the grab command. Without
it, grab -V terminates para_audiod.
---

diff --git a/Makefile.in b/Makefile.in
index d8932e43..834e4463 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -114,24 +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 < $<
 
 %_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 < $<