From 35993f0cd49206666262cfdd2be89af41ec28a1d Mon Sep 17 00:00:00 2001
From: Andre Noll <maan@systemlinux.org>
Date: Sat, 17 Jan 2009 19:22:14 +0100
Subject: [PATCH] Move ggo files to a separate directory.

---
 Makefile.in                                   | 49 ++++++++++---------
 afh.ggo => ggo/afh.ggo                        |  0
 alsa_write.ggo => ggo/alsa_write.ggo          |  0
 amp_filter.ggo => ggo/amp_filter.ggo          |  0
 audioc.ggo => ggo/audioc.ggo                  |  0
 audiod.ggo => ggo/audiod.ggo                  |  0
 client.ggo => ggo/client.ggo                  |  0
 .../compress_filter.ggo                       |  0
 dccp_recv.ggo => ggo/dccp_recv.ggo            |  0
 fade.ggo => ggo/fade.ggo                      |  0
 file_write.ggo => ggo/file_write.ggo          |  0
 filter.ggo => ggo/filter.ggo                  |  0
 fsck.ggo => ggo/fsck.ggo                      |  0
 grab_client.ggo => ggo/grab_client.ggo        |  0
 gui.ggo => ggo/gui.ggo                        |  0
 http_recv.ggo => ggo/http_recv.ggo            |  0
 mp3dec_filter.ggo => ggo/mp3dec_filter.ggo    |  0
 oggdec_filter.ggo => ggo/oggdec_filter.ggo    |  0
 osx_write.ggo => ggo/osx_write.ggo            |  0
 recv.ggo => ggo/recv.ggo                      |  0
 server.ggo => ggo/server.ggo                  |  0
 udp_recv.ggo => ggo/udp_recv.ggo              |  0
 write.ggo => ggo/write.ggo                    |  0
 23 files changed, 25 insertions(+), 24 deletions(-)
 rename afh.ggo => ggo/afh.ggo (100%)
 rename alsa_write.ggo => ggo/alsa_write.ggo (100%)
 rename amp_filter.ggo => ggo/amp_filter.ggo (100%)
 rename audioc.ggo => ggo/audioc.ggo (100%)
 rename audiod.ggo => ggo/audiod.ggo (100%)
 rename client.ggo => ggo/client.ggo (100%)
 rename compress_filter.ggo => ggo/compress_filter.ggo (100%)
 rename dccp_recv.ggo => ggo/dccp_recv.ggo (100%)
 rename fade.ggo => ggo/fade.ggo (100%)
 rename file_write.ggo => ggo/file_write.ggo (100%)
 rename filter.ggo => ggo/filter.ggo (100%)
 rename fsck.ggo => ggo/fsck.ggo (100%)
 rename grab_client.ggo => ggo/grab_client.ggo (100%)
 rename gui.ggo => ggo/gui.ggo (100%)
 rename http_recv.ggo => ggo/http_recv.ggo (100%)
 rename mp3dec_filter.ggo => ggo/mp3dec_filter.ggo (100%)
 rename oggdec_filter.ggo => ggo/oggdec_filter.ggo (100%)
 rename osx_write.ggo => ggo/osx_write.ggo (100%)
 rename recv.ggo => ggo/recv.ggo (100%)
 rename server.ggo => ggo/server.ggo (100%)
 rename udp_recv.ggo => ggo/udp_recv.ggo (100%)
 rename write.ggo => ggo/write.ggo (100%)

diff --git a/Makefile.in b/Makefile.in
index 30bc63fb..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 \
diff --git a/afh.ggo b/ggo/afh.ggo
similarity index 100%
rename from afh.ggo
rename to ggo/afh.ggo
diff --git a/alsa_write.ggo b/ggo/alsa_write.ggo
similarity index 100%
rename from alsa_write.ggo
rename to ggo/alsa_write.ggo
diff --git a/amp_filter.ggo b/ggo/amp_filter.ggo
similarity index 100%
rename from amp_filter.ggo
rename to ggo/amp_filter.ggo
diff --git a/audioc.ggo b/ggo/audioc.ggo
similarity index 100%
rename from audioc.ggo
rename to ggo/audioc.ggo
diff --git a/audiod.ggo b/ggo/audiod.ggo
similarity index 100%
rename from audiod.ggo
rename to ggo/audiod.ggo
diff --git a/client.ggo b/ggo/client.ggo
similarity index 100%
rename from client.ggo
rename to ggo/client.ggo
diff --git a/compress_filter.ggo b/ggo/compress_filter.ggo
similarity index 100%
rename from compress_filter.ggo
rename to ggo/compress_filter.ggo
diff --git a/dccp_recv.ggo b/ggo/dccp_recv.ggo
similarity index 100%
rename from dccp_recv.ggo
rename to ggo/dccp_recv.ggo
diff --git a/fade.ggo b/ggo/fade.ggo
similarity index 100%
rename from fade.ggo
rename to ggo/fade.ggo
diff --git a/file_write.ggo b/ggo/file_write.ggo
similarity index 100%
rename from file_write.ggo
rename to ggo/file_write.ggo
diff --git a/filter.ggo b/ggo/filter.ggo
similarity index 100%
rename from filter.ggo
rename to ggo/filter.ggo
diff --git a/fsck.ggo b/ggo/fsck.ggo
similarity index 100%
rename from fsck.ggo
rename to ggo/fsck.ggo
diff --git a/grab_client.ggo b/ggo/grab_client.ggo
similarity index 100%
rename from grab_client.ggo
rename to ggo/grab_client.ggo
diff --git a/gui.ggo b/ggo/gui.ggo
similarity index 100%
rename from gui.ggo
rename to ggo/gui.ggo
diff --git a/http_recv.ggo b/ggo/http_recv.ggo
similarity index 100%
rename from http_recv.ggo
rename to ggo/http_recv.ggo
diff --git a/mp3dec_filter.ggo b/ggo/mp3dec_filter.ggo
similarity index 100%
rename from mp3dec_filter.ggo
rename to ggo/mp3dec_filter.ggo
diff --git a/oggdec_filter.ggo b/ggo/oggdec_filter.ggo
similarity index 100%
rename from oggdec_filter.ggo
rename to ggo/oggdec_filter.ggo
diff --git a/osx_write.ggo b/ggo/osx_write.ggo
similarity index 100%
rename from osx_write.ggo
rename to ggo/osx_write.ggo
diff --git a/recv.ggo b/ggo/recv.ggo
similarity index 100%
rename from recv.ggo
rename to ggo/recv.ggo
diff --git a/server.ggo b/ggo/server.ggo
similarity index 100%
rename from server.ggo
rename to ggo/server.ggo
diff --git a/udp_recv.ggo b/ggo/udp_recv.ggo
similarity index 100%
rename from udp_recv.ggo
rename to ggo/udp_recv.ggo
diff --git a/write.ggo b/ggo/write.ggo
similarity index 100%
rename from write.ggo
rename to ggo/write.ggo
-- 
2.39.5