X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2FMakefile;h=dcc625cf7e71c6e4fa1d75f592571b4c91687bc5;hb=6da19745f8b8aa6f8cc02b59da507082fe509c5b;hp=2fe28d6b37ac158bde97a5d8333e0eae79427ef4;hpb=6ed4903f372bb3cb45ca67b31355d98877453690;p=rocksndiamonds.git

diff --git a/src/Makefile b/src/Makefile
index 2fe28d6b..dcc625cf 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -140,7 +140,7 @@ SRCS =	main.c		\
 	editor.c	\
 	files.c		\
 	tape.c		\
-	cartoons.c	\
+	anim.c		\
 	network.c	\
 	netserv.c
 
@@ -158,7 +158,7 @@ OBJS =	main.o		\
 	editor.o	\
 	files.o		\
 	tape.o		\
-	cartoons.o	\
+	anim.o		\
 	network.o	\
 	netserv.o
 
@@ -215,6 +215,9 @@ 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)
+ifdef BUILD_DIST
+	strip $(PROGNAME)
+endif
 
 libgame_dir:
 	@$(MAKE) -C $(LIBGAME_DIR)
@@ -267,7 +270,7 @@ $(ICON):
 	$(CC) $(PROFILING) $(CFLAGS) -c $*.c
 
 graphics_dir:
-	@$(MAKE) -C $(GRAPHICS_DIR)
+	@test -f $(GRAPHICS_DIR)/Makefile && $(MAKE) -C $(GRAPHICS_DIR) || true
 
 clean-obj:
 	$(MAKE) -C $(LIBGAME_DIR) clean
@@ -275,9 +278,6 @@ clean-obj:
 	$(MAKE) -C $(GAME_SP_DIR) clean
 	$(RM) $(OBJS)
 	$(RM) $(RNDLIBS)
-#	$(RM) $(LIBGAME)
-#	$(RM) $(GAME_EM)
-#	$(RM) $(GAME_SP)
 
 clean-ico:
 	$(RM) $(ICONBASE).ico
@@ -292,6 +292,8 @@ clean: clean-obj clean-ico clean-bin
 clean-git: clean auto-conf-clean
 	@$(MAKE) -C $(GRAPHICS_DIR) clean
 
+dist-clean: clean-obj clean-ico
+
 
 # -----------------------------------------------------------------------------
 # run and test targets
@@ -311,8 +313,6 @@ valgrind:
 # development only
 # -----------------------------------------------------------------------------
 
-dist-clean: clean-obj
-
 tags:
 	$(ETAGS) *.[ch] $(LIBGAME_DIR)/*.[ch] $(GAME_EM_DIR)/*.[ch] $(GAME_SP_DIR)/*.[ch]