X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=baae37b20433ee4d75696a4a52f536f798b5e198;hp=4e6ef96258b4f7c2fcf4ee324d0a6ac4b4ae7b01;hb=35993f0cd49206666262cfdd2be89af41ec28a1d;hpb=40de1dd2fdbb054444d585aa70e2d50166a66e07

diff --git a/Makefile.in b/Makefile.in
index 4e6ef962..baae37b2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -59,9 +59,10 @@ 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))
-gengetopts := $(wildcard *.ggo)
-gengetopts_c := $(gengetopts:.ggo=.cmdline.c)
-gengetopts_h := $(gengetopts:.ggo=.cmdline.h)
+ggo_dir := ggo
+gengetopts := $(wildcard $(ggo_dir)/*.ggo)
+gengetopts_c := $(patsubst %/,, $(gengetopts:.ggo=.cmdline.c))
+gengetopts_h := $(patsubst %/,, $(gengetopts:.ggo=.cmdline.h))
 autocrap := config.h.in configure
 tarball_pfx := @PACKAGE_TARNAME@-@PACKAGE_VERSION@
 tarball_delete = web versions pics .changelog_before_cvs .changelog_cvs .gitignore
@@ -80,7 +81,7 @@ include Makefile.deps
 
 module_ggo_opts := --set-version="(@PACKAGE_STRING@, $(codename))"
 
-grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
+grab_client.cmdline.h grab_client.cmdline.c: $(ggo_dir)/grab_client.ggo
 	gengetopt $(module_ggo_opts) \
 		-S \
 		--set-package=grab \
@@ -88,31 +89,31 @@ grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
 		--no-handle-error \
 		--no-handle-version \
 		--arg-struct-name=grab_client_args_info \
-		--file-name=$(subst .ggo,,$<).cmdline \
-		--func-name $(subst .ggo,,$<)_cmdline_parser < $<
+		--file-name=$(subst .ggo,,$(<F)).cmdline \
+		--func-name $(subst .ggo,,$(<F))_cmdline_parser < $<
 
-%_recv.cmdline.h %_recv.cmdline.c: %_recv.ggo
+%_recv.cmdline.h %_recv.cmdline.c: $(ggo_dir)/%_recv.ggo
 	gengetopt $(module_ggo_opts) \
-		--set-package=$(subst .ggo,,$<) \
-		--arg-struct-name=$(subst .ggo,,$<)_args_info \
-		--file-name=$(subst .ggo,,$<).cmdline \
-		--func-name $(subst .ggo,,$<)_cmdline_parser < $<
+		--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: %_filter.ggo
+%_filter.cmdline.h %_filter.cmdline.c: $(ggo_dir)/%_filter.ggo
 	gengetopt $(module_ggo_opts) \
-		--set-package=$(subst .ggo,,$<) \
-		--arg-struct-name=$(subst .ggo,,$<)_args_info \
-		--file-name=$(subst .ggo,,$<).cmdline \
-		--func-name $(subst _filter.ggo,,$<)_cmdline_parser < $<
-%_write.cmdline.h %_write.cmdline.c: %_write.ggo
+		--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,,$<) \
-		--arg-struct-name=$(subst .ggo,,$<)_args_info \
-		--file-name=$(subst .ggo,,$<).cmdline \
-		--func-name $(subst _write.ggo,,$<)_cmdline_parser < $<
+		--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
-	case $< in client.ggo) O="--unamed-opts=command";; \
+%.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";; \
@@ -121,7 +122,7 @@ grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
 		write.ggo) O="--no-handle-help";; \
 		audiod.ggo) O="--no-handle-help";; \
 	esac; \
-	if test $< != fsck.ggo; then O="$$O --conf-parser "; fi; \
+	if test $(<F) != fsck.ggo; then O="$$O --conf-parser "; fi; \
 	gengetopt $$O \
 		--no-handle-version \
 		--file-name=$(*F).cmdline \
@@ -171,12 +172,6 @@ web/%.man.in.html: man/man1/%.1
 	man2html $< | sed -e '/^<\/BODY>/,$$d' -e '1,/<\/HEAD><BODY>/d' > $@
 
 
-ortp_recv.o: ortp_recv.c
-	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ortp_cppflags@ $<
-
-ortp_send.o: ortp_send.c
-	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ortp_cppflags@ $<
-
 oggdec_filter.o: oggdec_filter.c
 	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @oggvorbis_cppflags@ $<
 ogg_afh.o: ogg_afh.c