Merge commit 'athcx/master'

[paraslash.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index fc0ffa487cdb0848f5ea924bf706e59d8907a35a..670be971b5f10a9d9510667ff2af7989648f18b3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -60,15 +60,21 @@ BINARIES = para_server para_client para_audioc para_recv \
 man_binaries := $(BINARIES)
 man_pages := $(patsubst %, man/man1/%.1, $(man_binaries))
 man_pages_in := $(patsubst %, web/%.man.in.html, $(man_binaries))
+
 ggo_dir := ggo
-gengetopts := $(wildcard $(ggo_dir)/*.ggo)
-gengetopts_c := $(patsubst %/,, $(gengetopts:.ggo=.cmdline.c))
-gengetopts_h := $(patsubst %/,, $(gengetopts:.ggo=.cmdline.h))
+
+m4_ggos := afh audioc audiod client filter fsck gui recv server write
+all_ggos := $(m4_ggos) dccp_recv oggdec_filter alsa_write fade http_recv \
+       osx_write udp_recv amp_filter compress_filter file_write \
+       grab_client mp3dec_filter
+ggo_generated := $(addsuffix .cmdline.c, $(all_ggos)) $(addsuffix .cmdline.h, $(all_ggos)) \
+       $(addsuffix .ggo, $(addprefix $(ggo_dir)/,$(m4_ggos)))
+
 autocrap := config.h.in configure
 tarball_pfx := @PACKAGE_TARNAME@-$(PACKAGE_VERSION)
 tarball_delete = web versions pics .changelog_before_cvs .changelog_cvs .gitignore
 tarball_delete := $(patsubst %,$(tarball_pfx)/%,$(tarball_delete))
-tarball_add := $(gengetopts_c) $(gengetopts_h) $(autocrap)
+tarball_add := $(ggo_generated) $(autocrap)
 tarball := @PACKAGE_TARNAME@-$(PACKAGE_VERSION).tar.bz2
 
 .PHONY: clean distclean maintainer-clean install man tarball
@@ -79,7 +85,7 @@ tarball: $(tarball)
 *.o: para.h config.h gcc-compat.h
 
 include Makefile.deps
-include $(ggo_dir)/Makefile.ggo
+include $(ggo_dir)/makefile
 
 %_command_list.c %_command_list.h: %.cmd
        ./command_util.sh c < $< >$@
@@ -98,21 +104,9 @@ man/man1/para_audiod.1: para_audiod audiod_command_list.man
        mkdir -p man/man1
        help2man -h --detailed-help -N -i audiod_command_list.man ./para_audiod > $@
 
-man/man1/para_filter.1: para_filter
-       mkdir -p man/man1
-       help2man -h --detailed-help -N ./$< > $@
-
-man/man1/para_write.1: para_write
-       mkdir -p man/man1
-       help2man -h --detailed-help -N ./$< > $@
-
-man/man1/para_recv.1: para_recv
-       mkdir -p man/man1
-       help2man -h --detailed-help -N ./$< > $@
-
 man/man1/%.1: %
        mkdir -p man/man1
-       help2man -N ./$< > $@
+       help2man -h --detailed-help -N ./$< > $@
 
 man/html/%.html: man/man1/%.1
        mkdir -p man/html
@@ -187,7 +181,7 @@ distclean: clean
        rm -f GPATH GRTAGS GSYMS GTAGS
 
 maintainer-clean: distclean
-       rm -f $(gengetopts_c) $(gengetopts_h) *.tar.bz2 \
+       rm -f $(ggo_generated) *.tar.bz2 \
                config.h configure \
                config.h.in skencil/*.pdf skencil/*.ps
        rm -f *_command_list.* *.man man/man1/*