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.

diff --git a/ggo.c b/ggo.c
index 7f8eb760b49d0d72d01f284d852dc419c4c042ca..e3aa5794cee33815e7c04e1fd033a9a7c34bf244 100644 (file)
--- 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 = help->short_help;
        if (!p)
                return;

-       p += 3; /* skip -h and -V */

        for (; *p; p++)
                printf_or_die("\t%s\n", *p);
 }
        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 4995e77f187f2886f59be5287a511335f250c8a3..ba9c9dab359c0f876f81f5c50066aa868f4e26cf 100644 (file)
--- a/m4/gengetopt/afh_recv.m4
+++ b/m4/gengetopt/afh_recv.m4
@@ -1,3 +1,5 @@
+args "--no-version --no-help"
+

 include(header.m4)
 <qu>
 text "
 include(header.m4)
 <qu>
 text "

diff --git a/m4/gengetopt/alsa_write.m4 b/m4/gengetopt/alsa_write.m4
index d0cd4071cdcf44346c982976f324547cabcafe19..54b2c0cb3f105259a26a68f9329f05ae09c70704 100644 (file)
--- a/m4/gengetopt/alsa_write.m4
+++ b/m4/gengetopt/alsa_write.m4
@@ -1,3 +1,5 @@
+args "--no-version --no-help"
+

 include(header.m4)
 
 <qu>
 include(header.m4)
 
 <qu>

diff --git a/m4/gengetopt/amp_filter.m4 b/m4/gengetopt/amp_filter.m4
index 865df3ac4048b330daf9055ffb47c2b1a2999eb3..f3907bf42b8eee1b273050940b976a25faff0f70 100644 (file)
--- 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"
 option "amp" a
 #~~~~~~~~~~~~~
 "amplification value"

diff --git a/m4/gengetopt/ao_write.m4 b/m4/gengetopt/ao_write.m4
index baccc57ffbfebd41ea9848a5d3b8667a7103af41..4deb58b7e2fcc3e20d79e2aa7d1e4736d0a298d0 100644 (file)
--- a/m4/gengetopt/ao_write.m4
+++ b/m4/gengetopt/ao_write.m4
@@ -1,3 +1,5 @@
+args "--no-version --no-help"
+

 include(header.m4)
 <qu>
 
 include(header.m4)
 <qu>
 

diff --git a/m4/gengetopt/compress_filter.m4 b/m4/gengetopt/compress_filter.m4
index 74dcbc0332753e1011962a62c9dbe961881b4d1f..739e4f0290fa3b39152cfb5fa5d6291f5619321f 100644 (file)
--- 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"
 option "blocksize" b
 #~~~~~~~~~~~~~~~~~~~
 "adjust block size"

diff --git a/m4/gengetopt/dccp_recv.m4 b/m4/gengetopt/dccp_recv.m4
index 80d312338b8811a48b3a9ac1da7c1fa888e0be40..0e556dd78c950c00ad4e8d154cded212a9e93a73 100644 (file)
--- 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"
 option "host" i
 "ip or host"
 string default="localhost"

diff --git a/m4/gengetopt/file_write.m4 b/m4/gengetopt/file_write.m4
index 56c44f7a7a6096b0e7e338f9571168bb5f1c56d4..560d55aa5f3ad18a1a72a52631e3c11aef3add45 100644 (file)
--- 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"
 option "filename" f
 #~~~~~~~~~~~~~~~~~~
 "specify output file name"

diff --git a/m4/gengetopt/http_recv.m4 b/m4/gengetopt/http_recv.m4
index 14ae99ab4f7c3bedf672e81a743808ed96183cc6..7544d77d1ebf518a903b8e0cef2d0a704c8bc581 100644 (file)
--- a/m4/gengetopt/http_recv.m4
+++ b/m4/gengetopt/http_recv.m4
@@ -1,3 +1,5 @@
+args "--no-version --no-help"
+

 include(header.m4)
 
 <qu>
 include(header.m4)
 
 <qu>

diff --git a/m4/gengetopt/mp3dec_filter.m4 b/m4/gengetopt/mp3dec_filter.m4
index c02f1583ba1ade9716c19ad3b9408b5c01932b20..aa8ef4530a00bd2230670e1c90ed2945c06e7dd0 100644 (file)
--- a/m4/gengetopt/mp3dec_filter.m4
+++ b/m4/gengetopt/mp3dec_filter.m4
@@ -1,3 +1,5 @@
+args "--no-version --no-help"
+

 include(header.m4)
 
 <qu>
 include(header.m4)
 
 <qu>

diff --git a/m4/gengetopt/oss_write.m4 b/m4/gengetopt/oss_write.m4
index 351561cd00c5daf9f8a00722a42a793d5bf49b6e..3aaba17ab0417c21f9f0d11c14d7864d7202de0b 100644 (file)
--- 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"
 option "device" d
 #~~~~~~~~~~~~~~~~
 "set PCM device"

diff --git a/m4/gengetopt/osx_write.m4 b/m4/gengetopt/osx_write.m4
index bee16d9e629c16acb8414407fefa8af2c1b7a992..2d49b406637596994b4edb6f45d556fc6b1f985c 100644 (file)
--- a/m4/gengetopt/osx_write.m4
+++ b/m4/gengetopt/osx_write.m4
@@ -1,3 +1,5 @@
+args "--no-version --no-help"
+

 section "osx options"
 #####################
 
 section "osx options"
 #####################
 

diff --git a/m4/gengetopt/prebuffer_filter.m4 b/m4/gengetopt/prebuffer_filter.m4
index 7553e9578d5e9bdccecdda34c6391ad840ea210d..a42889721cb5521e43b9965d71a45fd1738fef5c 100644 (file)
--- 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"
 option "duration" d
 #~~~~~~~~~~~~~~~~~~
 "prebuffer time"

diff --git a/m4/gengetopt/resample_filter.m4 b/m4/gengetopt/resample_filter.m4
index a4d081ff51852a5f6e39a41ad320da5b0b92e6c3..33dd6674e032d1f930034ca767edc4411e80ec78 100644 (file)
--- 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
 include(header.m4)
 
 option "converter" C

diff --git a/m4/gengetopt/udp_recv.m4 b/m4/gengetopt/udp_recv.m4
index 4c37eace5affa02a9cdb90e1aecbe65a12e9e184..78c3257d59838cf61e664868fe5761d858c83a2a 100644 (file)
--- 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"
 option "host" i
 "ip or host to receive udp packets from"
 string default="224.0.1.38"