From 533b0303c27fb9ba098bb72e30f41f0939b2dbd2 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Fri, 5 Apr 2013 18:58:03 +0000 Subject: [PATCH] Build receivers, filters and writers without -h and -V support. This is not needed since the help is printed by the driving application. It allows to get rid of an ugly "p += 3" statement in ggo.c. --- ggo.c | 1 - m4/gengetopt/afh_recv.m4 | 2 ++ m4/gengetopt/alsa_write.m4 | 2 ++ m4/gengetopt/amp_filter.m4 | 2 ++ m4/gengetopt/ao_write.m4 | 2 ++ m4/gengetopt/compress_filter.m4 | 2 ++ m4/gengetopt/dccp_recv.m4 | 2 ++ m4/gengetopt/file_write.m4 | 2 ++ m4/gengetopt/http_recv.m4 | 2 ++ m4/gengetopt/mp3dec_filter.m4 | 2 ++ m4/gengetopt/oss_write.m4 | 2 ++ m4/gengetopt/osx_write.m4 | 2 ++ m4/gengetopt/prebuffer_filter.m4 | 2 ++ m4/gengetopt/resample_filter.m4 | 2 ++ m4/gengetopt/udp_recv.m4 | 2 ++ 15 files changed, 28 insertions(+), 1 deletion(-) diff --git a/ggo.c b/ggo.c index 7f8eb760..e3aa5794 100644 --- a/ggo.c +++ b/ggo.c @@ -46,7 +46,6 @@ void ggo_print_help(struct ggo_help *help, int detailed_help) p = help->short_help; if (!p) return; - p += 3; /* skip -h and -V */ for (; *p; p++) printf_or_die("\t%s\n", *p); } diff --git a/m4/gengetopt/afh_recv.m4 b/m4/gengetopt/afh_recv.m4 index 4995e77f..ba9c9dab 100644 --- a/m4/gengetopt/afh_recv.m4 +++ b/m4/gengetopt/afh_recv.m4 @@ -1,3 +1,5 @@ +args "--no-version --no-help" + include(header.m4) text " diff --git a/m4/gengetopt/alsa_write.m4 b/m4/gengetopt/alsa_write.m4 index d0cd4071..54b2c0cb 100644 --- a/m4/gengetopt/alsa_write.m4 +++ b/m4/gengetopt/alsa_write.m4 @@ -1,3 +1,5 @@ +args "--no-version --no-help" + include(header.m4) diff --git a/m4/gengetopt/amp_filter.m4 b/m4/gengetopt/amp_filter.m4 index 865df3ac..f3907bf4 100644 --- a/m4/gengetopt/amp_filter.m4 +++ b/m4/gengetopt/amp_filter.m4 @@ -1,3 +1,5 @@ +args "--no-version --no-help" + option "amp" a #~~~~~~~~~~~~~ "amplification value" diff --git a/m4/gengetopt/ao_write.m4 b/m4/gengetopt/ao_write.m4 index baccc57f..4deb58b7 100644 --- a/m4/gengetopt/ao_write.m4 +++ b/m4/gengetopt/ao_write.m4 @@ -1,3 +1,5 @@ +args "--no-version --no-help" + include(header.m4) diff --git a/m4/gengetopt/compress_filter.m4 b/m4/gengetopt/compress_filter.m4 index 74dcbc03..739e4f02 100644 --- a/m4/gengetopt/compress_filter.m4 +++ b/m4/gengetopt/compress_filter.m4 @@ -1,3 +1,5 @@ +args "--no-version --no-help" + option "blocksize" b #~~~~~~~~~~~~~~~~~~~ "adjust block size" diff --git a/m4/gengetopt/dccp_recv.m4 b/m4/gengetopt/dccp_recv.m4 index 80d31233..0e556dd7 100644 --- a/m4/gengetopt/dccp_recv.m4 +++ b/m4/gengetopt/dccp_recv.m4 @@ -1,3 +1,5 @@ +args "--no-version --no-help" + option "host" i "ip or host" string default="localhost" diff --git a/m4/gengetopt/file_write.m4 b/m4/gengetopt/file_write.m4 index 56c44f7a..560d55aa 100644 --- a/m4/gengetopt/file_write.m4 +++ b/m4/gengetopt/file_write.m4 @@ -1,3 +1,5 @@ +args "--no-version --no-help" + option "filename" f #~~~~~~~~~~~~~~~~~~ "specify output file name" diff --git a/m4/gengetopt/http_recv.m4 b/m4/gengetopt/http_recv.m4 index 14ae99ab..7544d77d 100644 --- a/m4/gengetopt/http_recv.m4 +++ b/m4/gengetopt/http_recv.m4 @@ -1,3 +1,5 @@ +args "--no-version --no-help" + include(header.m4) diff --git a/m4/gengetopt/mp3dec_filter.m4 b/m4/gengetopt/mp3dec_filter.m4 index c02f1583..aa8ef453 100644 --- a/m4/gengetopt/mp3dec_filter.m4 +++ b/m4/gengetopt/mp3dec_filter.m4 @@ -1,3 +1,5 @@ +args "--no-version --no-help" + include(header.m4) diff --git a/m4/gengetopt/oss_write.m4 b/m4/gengetopt/oss_write.m4 index 351561cd..3aaba17a 100644 --- a/m4/gengetopt/oss_write.m4 +++ b/m4/gengetopt/oss_write.m4 @@ -1,3 +1,5 @@ +args "--no-version --no-help" + option "device" d #~~~~~~~~~~~~~~~~ "set PCM device" diff --git a/m4/gengetopt/osx_write.m4 b/m4/gengetopt/osx_write.m4 index bee16d9e..2d49b406 100644 --- a/m4/gengetopt/osx_write.m4 +++ b/m4/gengetopt/osx_write.m4 @@ -1,3 +1,5 @@ +args "--no-version --no-help" + section "osx options" ##################### diff --git a/m4/gengetopt/prebuffer_filter.m4 b/m4/gengetopt/prebuffer_filter.m4 index 7553e957..a4288972 100644 --- a/m4/gengetopt/prebuffer_filter.m4 +++ b/m4/gengetopt/prebuffer_filter.m4 @@ -1,3 +1,5 @@ +args "--no-version --no-help" + option "duration" d #~~~~~~~~~~~~~~~~~~ "prebuffer time" diff --git a/m4/gengetopt/resample_filter.m4 b/m4/gengetopt/resample_filter.m4 index a4d081ff..33dd6674 100644 --- a/m4/gengetopt/resample_filter.m4 +++ b/m4/gengetopt/resample_filter.m4 @@ -1,3 +1,5 @@ +args "--no-version --no-help" + include(header.m4) option "converter" C diff --git a/m4/gengetopt/udp_recv.m4 b/m4/gengetopt/udp_recv.m4 index 4c37eace..78c3257d 100644 --- a/m4/gengetopt/udp_recv.m4 +++ b/m4/gengetopt/udp_recv.m4 @@ -1,3 +1,5 @@ +args "--no-version --no-help" + option "host" i "ip or host to receive udp packets from" string default="224.0.1.38" -- 2.39.2