From b05bf3dca0ec7d951f1113066093843804e5be06 Mon Sep 17 00:00:00 2001
From: Holger Schemel <info@artsoft.org>
Date: Mon, 2 Mar 2015 17:04:40 +0100
Subject: [PATCH] updated Makefiles to fully build/clean graphics and auto-conf
 files

---
 Makefile                      |  3 +++
 graphics/gfx_classic/Makefile |  7 +++----
 src/Makefile                  | 16 +++++++++++++++-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index cbce7ef0..03320a5f 100644
--- a/Makefile
+++ b/Makefile
@@ -93,6 +93,9 @@ cross-win32:
 clean:
 	@$(MAKE_CMD) clean
 
+clean-git:
+	@$(MAKE_CMD) clean-git
+
 
 # -----------------------------------------------------------------------------
 # development, test, distribution build and packaging targets
diff --git a/graphics/gfx_classic/Makefile b/graphics/gfx_classic/Makefile
index 086aea51..54d446a1 100644
--- a/graphics/gfx_classic/Makefile
+++ b/graphics/gfx_classic/Makefile
@@ -13,7 +13,7 @@
 # configuration
 # -----------------------------------------------------------------------------
 
-RND = ../rocksndiamonds
+RND = ../../rocksndiamonds
 
 RM = rm -f
 
@@ -37,8 +37,6 @@ FILES = RocksBusy.$(EXT)	\
 	RocksScreen.$(EXT)	\
 	RocksToons.$(EXT)
 
-# FILES_GENERATED = RocksCE.$(EXT)
-
 
 # -----------------------------------------------------------------------------
 # build targets
@@ -57,7 +55,8 @@ RocksCE.ilbm: RocksCE-template.ilbm
 	bmptoppm RocksCE.bmp | ppmtoilbm > RocksCE.ilbm
 	$(RM) RocksCE.bmp
 
-clean-gfx:
+clean:
 	@for i in $(FILES); do			\
+		echo "$(RM) $$i";		\
 		$(RM) $$i;			\
 	done
diff --git a/src/Makefile b/src/Makefile
index de82a897..2a1afc90 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -224,12 +224,14 @@ endif
 ICON = $(ICONBASE).o
 endif
 
+GRAPHICS_DIR = ../graphics
+
 
 # -----------------------------------------------------------------------------
 # build targets
 # -----------------------------------------------------------------------------
 
-all: $(AUTOCONF) libgame_dir game_em_dir game_sp_dir $(PROGNAME)
+all: $(AUTOCONF) libgame_dir game_em_dir game_sp_dir $(PROGNAME) graphics_dir
 
 $(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
 	$(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME)
@@ -255,6 +257,12 @@ auto-conf:
 		$(CNFS_CMD) $$i > $$i;		\
 	done
 
+auto-conf-clean:
+	@for i in $(CNFS); do			\
+		echo "$(RM) $$i";		\
+		$(RM) $$i;			\
+	done
+
 conf_gfx.h: conf_gfx.c $(CNFS_CMD)
 	@$(MAKE) auto-conf
 
@@ -278,6 +286,9 @@ $(ICON):
 .c.o:
 	$(CC) $(PROFILING) $(CFLAGS) -c $*.c
 
+graphics_dir:
+	@$(MAKE) -C $(GRAPHICS_DIR)
+
 clean-obj:
 	$(MAKE) -C $(LIBGAME_DIR) clean
 	$(MAKE) -C $(GAME_EM_DIR) clean
@@ -298,6 +309,9 @@ clean-bin:
 
 clean: clean-obj clean-ico clean-bin
 
+clean-git: clean auto-conf-clean
+	@$(MAKE) -C $(GRAPHICS_DIR) clean
+
 
 # -----------------------------------------------------------------------------
 # run and test targets
-- 
2.34.1