[Scummvm-cvs-logs] CVS: scummvm Makefile.common,1.55,1.56 configure,1.34,1.35 Makefile,1.39,1.40 Makefile.new,1.6,1.7

[Jonathan Gray]

Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1:/tmp/cvs-serv17839

Modified Files:
	Makefile.common configure Makefile Makefile.new 
Log Message:
automatically use gcc 3.x specific dependency rules if using gcc 3.x, enable some additional warnings in Makefile.new

Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.common,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- Makefile.common	31 Jul 2003 18:41:05 -0000	1.55
+++ Makefile.common	2 Aug 2003 09:21:34 -0000	1.56
@@ -87,6 +87,7 @@
 #$(OBJS): $(INCS)
 
 
+ifndef HAVE_GCC3
 # If you use GCC, disable the above and enable this for intelligent
 # dependency tracking. 
 DEPDIRS = $(addsuffix /$(DEPDIR),$(MODULES))
@@ -98,15 +99,15 @@
 	$(ECHO) "$(*D)/" > $(*D)/$(DEPDIR)/$(*F).d
 	$(CAT) "$(*D)/$(DEPDIR)/$(*F).d2" >> "$(*D)/$(DEPDIR)/$(*F).d"
 	$(RM) "$(*D)/$(DEPDIR)/$(*F).d2"
-
+else
 # If you even have GCC 3.x, you can use this build rule, which is safer; the above
 # rule can get you into a bad state if you Ctrl-C at the wrong moment.
 # Also, with this GCC inserts additional dummy rules for the involved headers,
 # which ensures a smooth compilation even if said headers become obsolete.
 #.cpp.o:
-#	$(MKDIR) $(*D)/$(DEPDIR)
-#	$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
-
+	$(MKDIR) $(*D)/$(DEPDIR)
+	$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+endif
 -include $(DEPFILES) /dev/null
 
 distclean: clean

Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- configure	30 Jul 2003 19:25:26 -0000	1.34
+++ configure	2 Aug 2003 09:21:34 -0000	1.35
@@ -258,6 +258,7 @@
 
 if test "$_cxx_major" -ge "3" ; then
 	CXXFLAGS="$CXXFLAGS -ansi -W -Wno-unused-parameter"
+	_make_def_HAVE_GCC3='HAVE_GCC3 = 1'
 fi;
 
 #
@@ -539,8 +540,10 @@
 LIBS := $LIBS
 RANLIB := $_ranlib
 BACKEND := $_backend
-
 MODULES += $MODULES
+
+$_make_def_HAVE_GCC3
+
 INCLUDES += $INCLUDES
 OBJS += $OBJS
 DEFINES += $DEFINES

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- Makefile	30 Jul 2003 19:25:23 -0000	1.39
+++ Makefile	2 Aug 2003 09:21:34 -0000	1.40
@@ -63,6 +63,8 @@
 # Uncomment this to cause warnings to be treated as errors
 # CXXFLAGS+= -Werror
 
+# Uncomment this to use GCC 3.x specific dependency tracking (recommended)
+# HAVE_GCC3 = 1
 
 #######################################################################
 # Control which modules are built - uncomment any to disable module   #

Index: Makefile.new
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.new,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.new	28 Jul 2003 11:46:30 -0000	1.6
+++ Makefile.new	2 Aug 2003 09:21:34 -0000	1.7
@@ -30,6 +30,10 @@
 # CXXFLAGS+= -Wshadow -Werror
 
 CXXFLAGS:= -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -Wno-unknown-pragmas $(CXXFLAGS)
+# Even more warnings...
+CXXFLAGS+= -pedantic -Wpointer-arith -Wcast-qual -Wcast-align -Wconversion
+CXXFLAGS+= -Wshadow -Wimplicit -Wundef -Wnon-virtual-dtor
+CXXFLAGS+= -Wno-reorder -Wwrite-strings -fcheck-new -Wctor-dtor-privacy 
 
 #######################################################################
 # Misc stuff - you should normally never have to edit this            #
@@ -46,8 +50,6 @@
 	debian/prepare
 	fakeroot debian/rules binary
 
-config.mak:
-	./configure
 
 # Special target to create a application wrapper for Mac OS X
 bundle_name = ScummVM.app