From 94a3c445bf70808292e3c239752970b9be05e8f5 Mon Sep 17 00:00:00 2001
From: Andre Noll <maan@systemlinux.org>
Date: Sun, 22 Jul 2012 15:15:52 +0200
Subject: [PATCH] Treat all ggo files as m4 files.

Most input files for gengetopt are already generated from corresponding
m4 files. This renames the remaining ones, so that all .ggo files
are now generated and can be removed by the make clean variants.
Hence we do not need to track the set of generated ggo files any more.
---
 Makefile.in                                       | 5 +----
 ggo/{amp_filter.ggo => amp_filter.m4}             | 0
 ggo/{compress_filter.ggo => compress_filter.m4}   | 0
 ggo/{dccp_recv.ggo => dccp_recv.m4}               | 0
 ggo/{fade.ggo => fade.m4}                         | 0
 ggo/{file_write.ggo => file_write.m4}             | 0
 ggo/{oss_write.ggo => oss_write.m4}               | 0
 ggo/{osx_write.ggo => osx_write.m4}               | 0
 ggo/{prebuffer_filter.ggo => prebuffer_filter.m4} | 0
 ggo/{udp_recv.ggo => udp_recv.m4}                 | 0
 10 files changed, 1 insertion(+), 4 deletions(-)
 rename ggo/{amp_filter.ggo => amp_filter.m4} (100%)
 rename ggo/{compress_filter.ggo => compress_filter.m4} (100%)
 rename ggo/{dccp_recv.ggo => dccp_recv.m4} (100%)
 rename ggo/{fade.ggo => fade.m4} (100%)
 rename ggo/{file_write.ggo => file_write.m4} (100%)
 rename ggo/{oss_write.ggo => oss_write.m4} (100%)
 rename ggo/{osx_write.ggo => osx_write.m4} (100%)
 rename ggo/{prebuffer_filter.ggo => prebuffer_filter.m4} (100%)
 rename ggo/{udp_recv.ggo => udp_recv.m4} (100%)

diff --git a/Makefile.in b/Makefile.in
index 2410b583..19e17cf5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -73,9 +73,6 @@ CPPFLAGS += @osl_cppflags@
 
 man_pages := $(patsubst %, man/man1/%.1, @executables@)
 
-m4_ggos := afh audioc audiod client filter gui recv server write ao_write
-ggo_generated := $(addsuffix .ggo, $(addprefix $(ggo_dir)/,$(m4_ggos)))
-
 autocrap := config.h.in configure
 tarball_pfx := @PACKAGE_TARNAME@-$(PACKAGE_VERSION)
 tarball_delete := $(addprefix $(tarball_pfx)/,\
@@ -289,7 +286,7 @@ clean:
 clean2: clean
 	@[ -z "$(Q)" ] || echo 'CLEAN2'
 	$(Q) rm -rf man $(object_dir) $(cmdline_dir)
-	$(Q) rm -f *_command_list.* *_completion.h $(ggo_generated)
+	$(Q) rm -f *_command_list.* *_completion.h $(ggo_dir)/*.ggo
 distclean: clean2 test-clean
 	@[ -z "$(Q)" ] || echo 'DISTCLEAN'
 	$(Q) rm -f Makefile autoscan.log config.status config.log
diff --git a/ggo/amp_filter.ggo b/ggo/amp_filter.m4
similarity index 100%
rename from ggo/amp_filter.ggo
rename to ggo/amp_filter.m4
diff --git a/ggo/compress_filter.ggo b/ggo/compress_filter.m4
similarity index 100%
rename from ggo/compress_filter.ggo
rename to ggo/compress_filter.m4
diff --git a/ggo/dccp_recv.ggo b/ggo/dccp_recv.m4
similarity index 100%
rename from ggo/dccp_recv.ggo
rename to ggo/dccp_recv.m4
diff --git a/ggo/fade.ggo b/ggo/fade.m4
similarity index 100%
rename from ggo/fade.ggo
rename to ggo/fade.m4
diff --git a/ggo/file_write.ggo b/ggo/file_write.m4
similarity index 100%
rename from ggo/file_write.ggo
rename to ggo/file_write.m4
diff --git a/ggo/oss_write.ggo b/ggo/oss_write.m4
similarity index 100%
rename from ggo/oss_write.ggo
rename to ggo/oss_write.m4
diff --git a/ggo/osx_write.ggo b/ggo/osx_write.m4
similarity index 100%
rename from ggo/osx_write.ggo
rename to ggo/osx_write.m4
diff --git a/ggo/prebuffer_filter.ggo b/ggo/prebuffer_filter.m4
similarity index 100%
rename from ggo/prebuffer_filter.ggo
rename to ggo/prebuffer_filter.m4
diff --git a/ggo/udp_recv.ggo b/ggo/udp_recv.m4
similarity index 100%
rename from ggo/udp_recv.ggo
rename to ggo/udp_recv.m4
-- 
2.39.2