[Scummvm-cvs-logs] CVS: scummvm-new Makefile,1.1.1.1,1.2 Makefile.common,1.4,1.5

[Max Horn]

Update of /cvsroot/scummvm/scummvm-new
In directory usw-pr-cvs1:/tmp/cvs-serv30012

Modified Files:
	Makefile Makefile.common 
Log Message:
engine.* moved to common (where it belongs); added distclean target which gets rid of the .deps dirs, too; removed -Isound

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Makefile	21 Aug 2002 16:07:08 -0000	1.1.1.1
+++ Makefile	21 Aug 2002 16:53:11 -0000	1.2
@@ -4,9 +4,13 @@
 CFLAGS   = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar
 DEFINES  =
 LDFLAGS :=
-INCLUDES:= -I. -Icommon -Iscumm -Isound
+INCLUDES:= -I. -Icommon -Iscumm
 LIBS	 = -lncurses
 
+# Enable this if you want ScummVM to dump all scripts it runs.
+# This is mainly interesting for developers.
+# DEFINES += -DDUMP_SCRIPTS
+
 # Uncomment this to activate the MAD lib for compressed sound files
 DEFINES += -DCOMPRESSED_SOUND_FILE
 LIBS    += -lmad
@@ -40,10 +44,6 @@
 # LDFLAGS := -L/usr/X11R6/lib -L/usr/local/lib
 # INCLUDES+= -I/usr/X11R6/include
 # LIBS    += -lpthread -lXext -lX11
-
-# Enable this if you want ScummVM to dump all scripts it runs.
-# This is mainly interesting for developers.
-# DEFINES += -DDUMP_SCRIPTS
 
 CPPFLAGS= $(DEFINES) $(INCLUDES)
 

Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/Makefile.common,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.common	21 Aug 2002 16:40:33 -0000	1.4
+++ Makefile.common	21 Aug 2002 16:53:11 -0000	1.5
@@ -9,18 +9,18 @@
 
 INCS	= scumm/scumm.h common/scummsys.h common/stdafx.h
 
-COMMON_OBJS = common/config-file.o common/gameDetector.o common/main.o \
-	common/timer.o common/util.o
+COMMON_OBJS = common/config-file.o common/engine.o common/gameDetector.o \
+	common/main.o common/timer.o common/util.o
 
 GUI_OBJS = gui/gui.o gui/newgui.o gui/widget.o gui/dialog.o gui/ListWidget.o \
 	gui/ScrollBarWidget.o 
 
 SCUMM_OBJS = scumm/actor.o scumm/akos.o scumm/boxes.o scumm/bundle.o \
-	scumm/costume.o scumm/debug.o scumm/debugrl.o scumm/engine.o scumm/gfx.o \
-	scumm/imuse.o scumm/insane.o scumm/object.o scumm/resource.o \
-	scumm/resource_v3.o scumm/resource_v4.o scumm/saveload.o scumm/scaler.o \
-	scumm/script.o scumm/script_v1.o scumm/script_v2.o scumm/scummvm.o \
-	scumm/string.o scumm/sys.o scumm/vars.o scumm/verbs.o
+	scumm/costume.o scumm/debug.o scumm/debugrl.o scumm/gfx.o scumm/imuse.o \
+	scumm/insane.o scumm/object.o scumm/resource.o scumm/resource_v3.o \
+	scumm/resource_v4.o scumm/saveload.o scumm/scaler.o scumm/script.o \
+	scumm/script_v1.o scumm/script_v2.o scumm/scummvm.o scumm/string.o \
+	scumm/sys.o scumm/vars.o scumm/verbs.o
 
 SIMON_OBJS = simon/debug.o simon/items.o simon/midi.o simon/res.o simon/simon.o \
 	simon/sys.o simon/verb.o simon/vga.o
@@ -49,7 +49,7 @@
 clean:
 	rm -f $(OBJS) $(SCUMM_OBJS) $(SIMON_OBJS) scummvm$(EXEEXT)
 
-.PHONY: all clean dist
+.PHONY: all clean dist distclean
 
 # Default (dumb) compile & dependcy rules
 #.cpp.o:
@@ -71,3 +71,6 @@
 	rm -f "$(*D)/$(DEPDIR)/$(*F).d2"
 
 -include $(DEPFILES) /dev/null
+
+distclean: clean
+	rm -rf $(DEPDIRS)