From 2829202e393e4b0095d62739910ae56f04e83326 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 22 Jul 2012 16:11:11 +0200 Subject: [PATCH] Move gengetopt input files to m4 directory. This separates the gengetopt input directory from its output directory. All gengetopt m4 file are moved to the new m4/gengetopt directory. As a consequence of this cleanup, we may get rid of the .gitignore file for the generated ggo files, which is a good thing as it was hard to keep it up to date. --- Makefile.in | 8 +++++--- ggo/.gitignore | 12 ------------ {ggo => m4/gengetopt}/afh.m4 | 0 {ggo => m4/gengetopt}/alsa_write.m4 | 0 {ggo => m4/gengetopt}/amp_filter.m4 | 0 {ggo => m4/gengetopt}/ao_write.m4 | 0 {ggo => m4/gengetopt}/audioc.m4 | 0 {ggo => m4/gengetopt}/audiod.m4 | 0 {ggo => m4/gengetopt}/client.m4 | 0 {ggo => m4/gengetopt}/color.m4 | 0 {ggo => m4/gengetopt}/complete.m4 | 0 {ggo => m4/gengetopt}/compress_filter.m4 | 0 {ggo => m4/gengetopt}/config_file.m4 | 0 {ggo => m4/gengetopt}/daemon.m4 | 0 {ggo => m4/gengetopt}/dccp_recv.m4 | 0 {ggo => m4/gengetopt}/fade.m4 | 0 {ggo => m4/gengetopt}/file_write.m4 | 0 {ggo => m4/gengetopt}/filter.m4 | 0 {ggo => m4/gengetopt}/fsck.m4 | 0 {ggo => m4/gengetopt}/group.m4 | 0 {ggo => m4/gengetopt}/gui.m4 | 0 {ggo => m4/gengetopt}/header.m4 | 0 {ggo => m4/gengetopt}/history_file.m4 | 0 {ggo => m4/gengetopt}/http_recv.m4 | 0 {ggo => m4/gengetopt}/log_timing.m4 | 0 {ggo => m4/gengetopt}/logfile.m4 | 0 {ggo => m4/gengetopt}/loglevel.m4 | 0 {ggo => m4/gengetopt}/makefile | 4 ++-- {ggo => m4/gengetopt}/mp3dec_filter.m4 | 0 {ggo => m4/gengetopt}/oss_write.m4 | 0 {ggo => m4/gengetopt}/osx_write.m4 | 0 {ggo => m4/gengetopt}/prebuffer_filter.m4 | 0 {ggo => m4/gengetopt}/recv.m4 | 0 {ggo => m4/gengetopt}/server.m4 | 0 {ggo => m4/gengetopt}/udp_recv.m4 | 0 {ggo => m4/gengetopt}/user.m4 | 0 {ggo => m4/gengetopt}/write.m4 | 0 37 files changed, 7 insertions(+), 17 deletions(-) delete mode 100644 ggo/.gitignore rename {ggo => m4/gengetopt}/afh.m4 (100%) rename {ggo => m4/gengetopt}/alsa_write.m4 (100%) rename {ggo => m4/gengetopt}/amp_filter.m4 (100%) rename {ggo => m4/gengetopt}/ao_write.m4 (100%) rename {ggo => m4/gengetopt}/audioc.m4 (100%) rename {ggo => m4/gengetopt}/audiod.m4 (100%) rename {ggo => m4/gengetopt}/client.m4 (100%) rename {ggo => m4/gengetopt}/color.m4 (100%) rename {ggo => m4/gengetopt}/complete.m4 (100%) rename {ggo => m4/gengetopt}/compress_filter.m4 (100%) rename {ggo => m4/gengetopt}/config_file.m4 (100%) rename {ggo => m4/gengetopt}/daemon.m4 (100%) rename {ggo => m4/gengetopt}/dccp_recv.m4 (100%) rename {ggo => m4/gengetopt}/fade.m4 (100%) rename {ggo => m4/gengetopt}/file_write.m4 (100%) rename {ggo => m4/gengetopt}/filter.m4 (100%) rename {ggo => m4/gengetopt}/fsck.m4 (100%) rename {ggo => m4/gengetopt}/group.m4 (100%) rename {ggo => m4/gengetopt}/gui.m4 (100%) rename {ggo => m4/gengetopt}/header.m4 (100%) rename {ggo => m4/gengetopt}/history_file.m4 (100%) rename {ggo => m4/gengetopt}/http_recv.m4 (100%) rename {ggo => m4/gengetopt}/log_timing.m4 (100%) rename {ggo => m4/gengetopt}/logfile.m4 (100%) rename {ggo => m4/gengetopt}/loglevel.m4 (100%) rename {ggo => m4/gengetopt}/makefile (96%) rename {ggo => m4/gengetopt}/mp3dec_filter.m4 (100%) rename {ggo => m4/gengetopt}/oss_write.m4 (100%) rename {ggo => m4/gengetopt}/osx_write.m4 (100%) rename {ggo => m4/gengetopt}/prebuffer_filter.m4 (100%) rename {ggo => m4/gengetopt}/recv.m4 (100%) rename {ggo => m4/gengetopt}/server.m4 (100%) rename {ggo => m4/gengetopt}/udp_recv.m4 (100%) rename {ggo => m4/gengetopt}/user.m4 (100%) rename {ggo => m4/gengetopt}/write.m4 (100%) diff --git a/Makefile.in b/Makefile.in index ed0b9b05..3463553c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -21,7 +21,7 @@ codename := volatile relativity GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h) -m4_ggo_dir := ggo +m4_ggo_dir := m4/gengetopt ggo_dir := ggo object_dir := objects man_dir := man/man1 @@ -147,6 +147,8 @@ $(object_dir): mkdir -p $@ $(man_dir): mkdir -p $@ +$(ggo_dir): + mkdir -p $@ $(object_dir)/crypt.o: crypt.c | $(object_dir) @[ -z "$(Q)" ] || echo 'CC $<' @@ -286,8 +288,8 @@ clean: clean2: clean @[ -z "$(Q)" ] || echo 'CLEAN2' - $(Q) rm -rf man $(object_dir) $(cmdline_dir) - $(Q) rm -f *_command_list.* *_completion.h $(ggo_dir)/*.ggo + $(Q) rm -rf man $(object_dir) $(cmdline_dir) $(ggo_dir) + $(Q) rm -f *_command_list.* *_completion.h distclean: clean2 test-clean @[ -z "$(Q)" ] || echo 'DISTCLEAN' $(Q) rm -f Makefile autoscan.log config.status config.log diff --git a/ggo/.gitignore b/ggo/.gitignore deleted file mode 100644 index 82d505b5..00000000 --- a/ggo/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -afh.ggo -audioc.ggo -audiod.ggo -client.ggo -filter.ggo -fsck.ggo -gui.ggo -recv.ggo -server.ggo -write.ggo -ao_write.ggo -alsa_write.ggo diff --git a/ggo/afh.m4 b/m4/gengetopt/afh.m4 similarity index 100% rename from ggo/afh.m4 rename to m4/gengetopt/afh.m4 diff --git a/ggo/alsa_write.m4 b/m4/gengetopt/alsa_write.m4 similarity index 100% rename from ggo/alsa_write.m4 rename to m4/gengetopt/alsa_write.m4 diff --git a/ggo/amp_filter.m4 b/m4/gengetopt/amp_filter.m4 similarity index 100% rename from ggo/amp_filter.m4 rename to m4/gengetopt/amp_filter.m4 diff --git a/ggo/ao_write.m4 b/m4/gengetopt/ao_write.m4 similarity index 100% rename from ggo/ao_write.m4 rename to m4/gengetopt/ao_write.m4 diff --git a/ggo/audioc.m4 b/m4/gengetopt/audioc.m4 similarity index 100% rename from ggo/audioc.m4 rename to m4/gengetopt/audioc.m4 diff --git a/ggo/audiod.m4 b/m4/gengetopt/audiod.m4 similarity index 100% rename from ggo/audiod.m4 rename to m4/gengetopt/audiod.m4 diff --git a/ggo/client.m4 b/m4/gengetopt/client.m4 similarity index 100% rename from ggo/client.m4 rename to m4/gengetopt/client.m4 diff --git a/ggo/color.m4 b/m4/gengetopt/color.m4 similarity index 100% rename from ggo/color.m4 rename to m4/gengetopt/color.m4 diff --git a/ggo/complete.m4 b/m4/gengetopt/complete.m4 similarity index 100% rename from ggo/complete.m4 rename to m4/gengetopt/complete.m4 diff --git a/ggo/compress_filter.m4 b/m4/gengetopt/compress_filter.m4 similarity index 100% rename from ggo/compress_filter.m4 rename to m4/gengetopt/compress_filter.m4 diff --git a/ggo/config_file.m4 b/m4/gengetopt/config_file.m4 similarity index 100% rename from ggo/config_file.m4 rename to m4/gengetopt/config_file.m4 diff --git a/ggo/daemon.m4 b/m4/gengetopt/daemon.m4 similarity index 100% rename from ggo/daemon.m4 rename to m4/gengetopt/daemon.m4 diff --git a/ggo/dccp_recv.m4 b/m4/gengetopt/dccp_recv.m4 similarity index 100% rename from ggo/dccp_recv.m4 rename to m4/gengetopt/dccp_recv.m4 diff --git a/ggo/fade.m4 b/m4/gengetopt/fade.m4 similarity index 100% rename from ggo/fade.m4 rename to m4/gengetopt/fade.m4 diff --git a/ggo/file_write.m4 b/m4/gengetopt/file_write.m4 similarity index 100% rename from ggo/file_write.m4 rename to m4/gengetopt/file_write.m4 diff --git a/ggo/filter.m4 b/m4/gengetopt/filter.m4 similarity index 100% rename from ggo/filter.m4 rename to m4/gengetopt/filter.m4 diff --git a/ggo/fsck.m4 b/m4/gengetopt/fsck.m4 similarity index 100% rename from ggo/fsck.m4 rename to m4/gengetopt/fsck.m4 diff --git a/ggo/group.m4 b/m4/gengetopt/group.m4 similarity index 100% rename from ggo/group.m4 rename to m4/gengetopt/group.m4 diff --git a/ggo/gui.m4 b/m4/gengetopt/gui.m4 similarity index 100% rename from ggo/gui.m4 rename to m4/gengetopt/gui.m4 diff --git a/ggo/header.m4 b/m4/gengetopt/header.m4 similarity index 100% rename from ggo/header.m4 rename to m4/gengetopt/header.m4 diff --git a/ggo/history_file.m4 b/m4/gengetopt/history_file.m4 similarity index 100% rename from ggo/history_file.m4 rename to m4/gengetopt/history_file.m4 diff --git a/ggo/http_recv.m4 b/m4/gengetopt/http_recv.m4 similarity index 100% rename from ggo/http_recv.m4 rename to m4/gengetopt/http_recv.m4 diff --git a/ggo/log_timing.m4 b/m4/gengetopt/log_timing.m4 similarity index 100% rename from ggo/log_timing.m4 rename to m4/gengetopt/log_timing.m4 diff --git a/ggo/logfile.m4 b/m4/gengetopt/logfile.m4 similarity index 100% rename from ggo/logfile.m4 rename to m4/gengetopt/logfile.m4 diff --git a/ggo/loglevel.m4 b/m4/gengetopt/loglevel.m4 similarity index 100% rename from ggo/loglevel.m4 rename to m4/gengetopt/loglevel.m4 diff --git a/ggo/makefile b/m4/gengetopt/makefile similarity index 96% rename from ggo/makefile rename to m4/gengetopt/makefile index 4bc29a0a..8b0c1f8d 100644 --- a/ggo/makefile +++ b/m4/gengetopt/makefile @@ -70,6 +70,6 @@ $(ggo_dir)/client.ggo: \ $(m4_ggo_dir)/history_file.m4 \ $(m4_ggo_dir)/complete.m4 -$(ggo_dir)/%.ggo: $(m4_ggo_dir)/%.m4 $(m4_ggo_dir)/header.m4 +$(ggo_dir)/%.ggo: $(m4_ggo_dir)/%.m4 $(m4_ggo_dir)/header.m4 | $(ggo_dir) @[ -z "$(Q)" ] || echo 'M4 $<' - $(Q) cd $(ggo_dir); m4 $( $(@F) + $(Q) m4 -I $(m4_ggo_dir) $< > $@ diff --git a/ggo/mp3dec_filter.m4 b/m4/gengetopt/mp3dec_filter.m4 similarity index 100% rename from ggo/mp3dec_filter.m4 rename to m4/gengetopt/mp3dec_filter.m4 diff --git a/ggo/oss_write.m4 b/m4/gengetopt/oss_write.m4 similarity index 100% rename from ggo/oss_write.m4 rename to m4/gengetopt/oss_write.m4 diff --git a/ggo/osx_write.m4 b/m4/gengetopt/osx_write.m4 similarity index 100% rename from ggo/osx_write.m4 rename to m4/gengetopt/osx_write.m4 diff --git a/ggo/prebuffer_filter.m4 b/m4/gengetopt/prebuffer_filter.m4 similarity index 100% rename from ggo/prebuffer_filter.m4 rename to m4/gengetopt/prebuffer_filter.m4 diff --git a/ggo/recv.m4 b/m4/gengetopt/recv.m4 similarity index 100% rename from ggo/recv.m4 rename to m4/gengetopt/recv.m4 diff --git a/ggo/server.m4 b/m4/gengetopt/server.m4 similarity index 100% rename from ggo/server.m4 rename to m4/gengetopt/server.m4 diff --git a/ggo/udp_recv.m4 b/m4/gengetopt/udp_recv.m4 similarity index 100% rename from ggo/udp_recv.m4 rename to m4/gengetopt/udp_recv.m4 diff --git a/ggo/user.m4 b/m4/gengetopt/user.m4 similarity index 100% rename from ggo/user.m4 rename to m4/gengetopt/user.m4 diff --git a/ggo/write.m4 b/m4/gengetopt/write.m4 similarity index 100% rename from ggo/write.m4 rename to m4/gengetopt/write.m4 -- 2.39.2