projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated Makefiles to fully build/clean graphics and auto-conf files
[rocksndiamonds.git]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index 265bf9922e68382b2b2337a30a94c347160a0bf8..2a1afc908ceb0be4d268c3149edd2f8177c95147 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-1,7
+1,12
@@
# =============================================================================
# =============================================================================
-# Rocks'n'Diamonds
Makefile (src)
+# Rocks'n'Diamonds
- McDuffin Strikes Back!
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
-# (c) 1995-2006 Holger Schemel <info@artsoft.org>
+# (c) 1995-2014 by Artsoft Entertainment
+# Holger Schemel
+# info@artsoft.org
+# http://www.artsoft.org/
+# -----------------------------------------------------------------------------
+# src/Makefile
# =============================================================================
# -----------------------------------------------------------------------------
# =============================================================================
# -----------------------------------------------------------------------------
@@
-219,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)
@@
-250,13
+257,19
@@
auto-conf:
$(CNFS_CMD) $$i > $$i; \
done
$(CNFS_CMD) $$i > $$i; \
done
-conf_gfx.h: conf_gfx.c
+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
@$(MAKE) auto-conf
-conf_snd.h: conf_snd.c
+conf_snd.h: conf_snd.c
$(CNFS_CMD)
@$(MAKE) auto-conf
@$(MAKE) auto-conf
-conf_mus.h: conf_mus.c
+conf_mus.h: conf_mus.c
$(CNFS_CMD)
@$(MAKE) auto-conf
# $(TIMESTAMP_FILE): $(SRCS) $(LIBGAME) $(GAME_EM) $(GAME_SP)
@$(MAKE) auto-conf
# $(TIMESTAMP_FILE): $(SRCS) $(LIBGAME) $(GAME_EM) $(GAME_SP)
@@
-273,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
@@
-293,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