updated Makefiles to fully build/clean graphics and auto-conf files

diff --git a/Makefile b/Makefile
index cbce7ef0a7e2d251fafb68860443cf696897eaa9..03320a5f4f056718e1161f2f3c5cb25a6115e2f4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -93,6 +93,9 @@ cross-win32:
 clean:
        @$(MAKE_CMD) clean
 
 clean:
        @$(MAKE_CMD) clean
 

+clean-git:
+       @$(MAKE_CMD) clean-git
+

 
 # -----------------------------------------------------------------------------
 # development, test, distribution build and packaging targets
 
 # -----------------------------------------------------------------------------
 # development, test, distribution build and packaging targets

diff --git a/graphics/gfx_classic/Makefile b/graphics/gfx_classic/Makefile
index 086aea512a9425161fd6966e9ff52451883872df..54d446a10093a754a59667df5e90ce2431c3ee99 100644 (file)
--- a/graphics/gfx_classic/Makefile
+++ b/graphics/gfx_classic/Makefile
@@ -13,7 +13,7 @@
 # configuration
 # -----------------------------------------------------------------------------
 
 # configuration
 # -----------------------------------------------------------------------------
 

-RND = ../rocksndiamonds
+RND = ../../rocksndiamonds

 
 RM = rm -f
 
 
 RM = rm -f
 


@@ -37,8 +37,6 @@ FILES = RocksBusy.$(EXT)      \
        RocksScreen.$(EXT)      \
        RocksToons.$(EXT)
 
        RocksScreen.$(EXT)      \
        RocksToons.$(EXT)
 

-# FILES_GENERATED = RocksCE.$(EXT)
-

 
 # -----------------------------------------------------------------------------
 # build targets
 
 # -----------------------------------------------------------------------------
 # build targets


@@ -57,7 +55,8 @@ RocksCE.ilbm: RocksCE-template.ilbm
        bmptoppm RocksCE.bmp | ppmtoilbm > RocksCE.ilbm
        $(RM) RocksCE.bmp
 
        bmptoppm RocksCE.bmp | ppmtoilbm > RocksCE.ilbm
        $(RM) RocksCE.bmp
 

-clean-gfx:
+clean:

        @for i in $(FILES); do                  \
        @for i in $(FILES); do                  \

+               echo "$(RM) $$i";               \

                $(RM) $$i;                      \
        done
                $(RM) $$i;                      \
        done

diff --git a/src/Makefile b/src/Makefile
index de82a897b71086a4eb3fb45bdc03fffd796365bc..2a1afc908ceb0be4d268c3149edd2f8177c95147 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -224,12 +224,14 @@ endif
 ICON = $(ICONBASE).o
 endif
 
 ICON = $(ICONBASE).o
 endif
 

+GRAPHICS_DIR = ../graphics
+

 
 # -----------------------------------------------------------------------------
 # build targets
 # -----------------------------------------------------------------------------
 
 
 # -----------------------------------------------------------------------------
 # 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)
 
 $(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
 
                $(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
 
 conf_gfx.h: conf_gfx.c $(CNFS_CMD)
        @$(MAKE) auto-conf
 


@@ -278,6 +286,9 @@ $(ICON):
 .c.o:
        $(CC) $(PROFILING) $(CFLAGS) -c $*.c
 
 .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
 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: clean-obj clean-ico clean-bin
 

+clean-git: clean auto-conf-clean
+       @$(MAKE) -C $(GRAPHICS_DIR) clean
+

 
 # -----------------------------------------------------------------------------
 # run and test targets
 
 # -----------------------------------------------------------------------------
 # run and test targets