Don't ship generated *cmdline.[ch] files in tarball.

These files increase the size of the tarball considerably for no real
gain. Gengetopt is available as a package on all major distributions,
so simply require gengetopt.

diff --git a/Makefile.in b/Makefile.in
index 5016b065b85d9c36dccff605b4d8e8519a745610..3f4e1651a5ffdd147d1f55d5665f4b0b35ef2a22 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -75,14 +75,12 @@ all_ggos := $(m4_ggos) dccp_recv alsa_write oss_write fade http_recv \
        osx_write udp_recv amp_filter compress_filter file_write \
        mp3dec_filter prebuffer_filter
 ggo_generated := $(addsuffix .ggo, $(addprefix $(ggo_dir)/,$(m4_ggos)))
-cmdline_generated := $(addprefix $(cmdline_dir)/,$(addsuffix .cmdline.c, $(all_ggos)) \
-       $(addsuffix .cmdline.h, $(all_ggos)))
 
 autocrap := config.h.in configure
 tarball_pfx := @PACKAGE_TARNAME@-$(PACKAGE_VERSION)
 tarball_delete := $(addprefix $(tarball_pfx)/,\
        web versions .changelog_before_cvs .changelog_cvs .gitignore\
-       $(ggo_dir) skencil)
+       skencil)
 tarball := @PACKAGE_TARNAME@-$(PACKAGE_VERSION).tar.bz2
 
 # To put more focus on warnings, be less verbose as default
@@ -284,8 +282,8 @@ clean:
 
 clean2: clean
        @[ -z "$(Q)" ] || echo 'CLEAN2'
-       $(Q) rm -rf man $(object_dir)
-       $(Q) rm -f *_command_list.*
+       $(Q) rm -rf man $(object_dir) $(cmdline_dir)
+       $(Q) rm -f *_command_list.* $(ggo_generated)
 
 distclean: clean2 test-clean
        @[ -z "$(Q)" ] || echo 'DISTCLEAN'
@@ -294,10 +292,10 @@ distclean: clean2 test-clean
        $(Q) rm -f GPATH GRTAGS GSYMS GTAGS
 
 maintainer-clean: distclean
-       rm -f $(ggo_generated) *.tar.bz2 \
+       rm -f *.tar.bz2 \
                config.h configure \
                config.h.in skencil/*.pdf skencil/*.ps
-       rm -rf web_sync $(cmdline_dir)
+       rm -rf web_sync
 
 install: all man
        mkdir -p $(BINDIR) $(MANDIR)
@@ -305,19 +303,17 @@ install: all man
        $(install_sh) -m 644 $(man_pages) $(MANDIR)
        mkdir -p $(VARDIR) >/dev/null 2>&1 || true # not fatal, so don't complain
 
-$(tarball): $(cmdline_generated)
+$(tarball):
        rm -rf $(tarball_pfx).tar.bz2 $(tarball_pfx)
        git archive --format=tar --prefix=$(tarball_pfx)/ HEAD \
                | tar --delete $(tarball_delete) > $(tarball_pfx).tar
-       mkdir -p $(tarball_pfx)/$(cmdline_dir)
+       mkdir -p $(tarball_pfx)
        ./GIT-VERSION-GEN > $(tarball_pfx)/VERSION
        cp -r $(autocrap) $(tarball_pfx)
-       cp -r $(cmdline_generated) $(tarball_pfx)/$(cmdline_dir)
        tar rf $(tarball_pfx).tar $(tarball_pfx)/*
-       rm -rf $(tarball_pfx)
        bzip2 -9 $(tarball_pfx).tar
-       rm -f $(tarball_pfx).tar
        ls -l $(tarball_pfx).tar.bz2
+       rm -rf $(tarball_pfx)
 %.ps: %.sk
        sk2ps $< > $@
 %.pdf: %.ps