Differentiate between ggo_dir and m4_ggo dir.

[paraslash.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 2410b583c31f83e30125f60396133802e629a9c6..ed0b9b0562a75adc745d3c1f404d5e75529fd4eb 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -21,6 +21,7 @@ codename := volatile relativity
 
 GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h)
 
+m4_ggo_dir := ggo
 ggo_dir := ggo
 object_dir := objects
 man_dir := man/man1
@@ -73,9 +74,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)/,\
@@ -105,7 +103,7 @@ dep: $(deps)
 man: $(man_pages)
 tarball: $(tarball)
 
--include $(ggo_dir)/makefile
+-include $(m4_ggo_dir)/makefile
 
 # When in doubt, use brute force (Ken Thompson)
 TOUPPER = \
@@ -289,7 +287,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