X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2FMakefile;h=7a128e75ed18b79b4e3f97cf34ff6abafe2d0479;hb=4ed68b54ed9bed72d87eac4dd7b117fc4b8022d6;hp=a29e0919a2ede45b77bc33d76fda2832744dfd80;hpb=c20ac97a090642df0346c19e5a6b4ceaf40b8921;p=rocksndiamonds.git

diff --git a/src/Makefile b/src/Makefile
index a29e0919..7a128e75 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -156,14 +156,6 @@ endif
 CFLAGS = $(OPTIONS) $(ANALYZE) $(SYS_CFLAGS)  $(EXTRA_CFLAGS) $(CONFIG)
 LDFLAGS =           $(ANALYZE) $(SYS_LDFLAGS) $(EXTRA_LDFLAGS)
 
-# !!! DEPENDENCY TO GLIB SHOULD BE REMOVED AGAIN !!!
-GLIB_CFLAGS  := $(shell pkg-config --cflags glib-2.0)
-GLIB_LDFLAGS := $(shell pkg-config --libs   glib-2.0)
-
-CFLAGS  := $(CFLAGS)  $(GLIB_CFLAGS)
-LDFLAGS := $(LDFLAGS) $(GLIB_LDFLAGS)
-# !!! DEPENDENCY TO GLIB SHOULD BE REMOVED AGAIN !!!
-
 
 SRCS =	main.c		\
 	conf_gfx.c	\
@@ -255,7 +247,7 @@ GAME_SP = $(GAME_SP_DIR)/game_sp.a
 GAME_MM_DIR = game_mm
 GAME_MM = $(GAME_MM_DIR)/game_mm.a
 
-RNDLIBS = $(LIBGAME) $(GAME_BD) $(GAME_EM) $(GAME_SP) $(GAME_MM)
+RNDLIBS = $(GAME_BD) $(GAME_EM) $(GAME_SP) $(GAME_MM) $(LIBGAME)
 AUTOCONF = conf_gfx.h conf_snd.h conf_mus.h
 
 ICONBASE = windows_icon
@@ -413,6 +405,14 @@ depend:
 	$(MAKE) -C $(GAME_MM_DIR) depend
 	for i in $(SRCS); do $(CPP) $(CFLAGS) -M $$i; done > .depend
 
+depend-clean:
+	$(MAKE) -C $(LIBGAME_DIR) depend-clean
+	$(MAKE) -C $(GAME_BD_DIR) depend-clean
+	$(MAKE) -C $(GAME_EM_DIR) depend-clean
+	$(MAKE) -C $(GAME_SP_DIR) depend-clean
+	$(MAKE) -C $(GAME_MM_DIR) depend-clean
+	$(RM) .depend
+
 ifeq (.depend,$(wildcard .depend))
 include .depend
 endif