X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=670be971b5f10a9d9510667ff2af7989648f18b3;hp=baae37b20433ee4d75696a4a52f536f798b5e198;hb=1583369f6defebc7f44249b9ce4cc01f717db3b9;hpb=35993f0cd49206666262cfdd2be89af41ec28a1d

diff --git a/Makefile.in b/Makefile.in
index baae37b2..670be971 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,7 +5,8 @@ BINDIR := @bindir@
 VARDIR := /var/paraslash
 PKGDATADIR := @datarootdir@/@PACKAGE_NAME@
 MANDIR := @datarootdir@/man/man1
-
+PACKAGE_VERSION := @PACKAGE_VERSION@
+PACKAGE_STRING := @PACKAGE_STRING@
 install_sh := @install_sh@
 
 build_date := $(shell date)
@@ -59,16 +60,22 @@ 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_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 := @PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2
+tarball_add := $(ggo_generated) $(autocrap)
+tarball := @PACKAGE_TARNAME@-$(PACKAGE_VERSION).tar.bz2
 
 .PHONY: clean distclean maintainer-clean install man tarball
 all: $(BINARIES) $(man_pages)
@@ -78,58 +85,7 @@ tarball: $(tarball)
 *.o: para.h config.h gcc-compat.h
 
 include Makefile.deps
-
-module_ggo_opts := --set-version="(@PACKAGE_STRING@, $(codename))"
-
-grab_client.cmdline.h grab_client.cmdline.c: $(ggo_dir)/grab_client.ggo
-	gengetopt $(module_ggo_opts) \
-		-S \
-		--set-package=grab \
-		--no-handle-help \
-		--no-handle-error \
-		--no-handle-version \
-		--arg-struct-name=grab_client_args_info \
-		--file-name=$(subst .ggo,,$(<F)).cmdline \
-		--func-name $(subst .ggo,,$(<F))_cmdline_parser < $<
-
-%_recv.cmdline.h %_recv.cmdline.c: $(ggo_dir)/%_recv.ggo
-	gengetopt $(module_ggo_opts) \
-		--set-package=$(subst .ggo,,$(<F)) \
-		--arg-struct-name=$(subst .ggo,,$(<F))_args_info \
-		--file-name=$(subst .ggo,,$(<F)).cmdline \
-		--func-name $(subst .ggo,,$(<F))_cmdline_parser < $<
-
-%_filter.cmdline.h %_filter.cmdline.c: $(ggo_dir)/%_filter.ggo
-	gengetopt $(module_ggo_opts) \
-		--set-package=$(subst .ggo,,$(<F)) \
-		--arg-struct-name=$(subst .ggo,,$(<F))_args_info \
-		--file-name=$(subst .ggo,,$(<F)).cmdline \
-		--func-name $(subst _filter.ggo,,$(<F))_cmdline_parser < $<
-%_write.cmdline.h %_write.cmdline.c: $(ggo_dir)/%_write.ggo
-	gengetopt -S $(module_ggo_opts) \
-		--set-package=$(subst .ggo,,$(<F)) \
-		--arg-struct-name=$(subst .ggo,,$(<F))_args_info \
-		--file-name=$(subst .ggo,,$(<F)).cmdline \
-		--func-name $(subst _write.ggo,,$(<F))_cmdline_parser < $<
-
-%.cmdline.h %.cmdline.c: $(ggo_dir)/%.ggo
-	case $(<F) in client.ggo) O="--unamed-opts=command";; \
-		audioc.ggo) O="--unamed-opts=command";; \
-		fsck.ggo) O="--unamed-opts=table";; \
-		afh.ggo) O="--unamed-opts=audio_file";; \
-		recv.ggo) O="--no-handle-help";; \
-		filter.ggo) O="--no-handle-help";; \
-		write.ggo) O="--no-handle-help";; \
-		audiod.ggo) O="--no-handle-help";; \
-	esac; \
-	if test $(<F) != fsck.ggo; then O="$$O --conf-parser "; fi; \
-	gengetopt $$O \
-		--no-handle-version \
-		--file-name=$(*F).cmdline \
-		--func-name $(*F)_cmdline_parser \
-		--arg-struct-name=$(*F)_args_info \
-		--set-package="para_$(subst .cmdline,,$(*F))" \
-		--set-version="@PACKAGE_VERSION@"  < $<
+include $(ggo_dir)/makefile
 
 %_command_list.c %_command_list.h: %.cmd
 	./command_util.sh c < $< >$@
@@ -148,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
@@ -237,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/*
@@ -249,7 +193,7 @@ install: all man
 	$(install_sh) -m 644 $(man_pages) $(MANDIR)
 	mkdir -p $(VARDIR) >/dev/null 2>&1 || true # not fatal, so don't complain
 
-@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: $(tarball_add)
+@PACKAGE_TARNAME@-$(PACKAGE_VERSION).tar.bz2: $(tarball_add)
 	rm -rf $(tarball_pfx).tar.bz2 $(tarball_pfx)
 	git archive --format=tar --prefix=$(tarball_pfx)/ HEAD \
 		| tar --delete $(tarball_delete) > $(tarball_pfx).tar