[Scummvm-cvs-logs] CVS: scummvm Makefile.new,1.1,1.2 configure,1.18,1.19

[Max Horn]

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

Modified Files:
	Makefile.new configure 
Log Message:
let config.mak overwrite the default values (defensive coding style :-)

Index: Makefile.new
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.new,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.new	20 May 2003 09:43:33 -0000	1.1
+++ Makefile.new	20 May 2003 10:24:24 -0000	1.2
@@ -1,10 +1,8 @@
 # $Header$
 
-include config.mak
-
-# CXX     := c++
+CXX     := c++
 AR      := ar cru
-# RANLIB  := ranlib
+RANLIB  := ranlib
 RM      := rm -f
 MKDIR   := mkdir -p
 ECHO    := echo -n
@@ -23,8 +21,11 @@
 DEFINES := -DHAVE_CONFIG_H
 LDFLAGS :=
 INCLUDES:= -I. -Icommon
-# LIBS	:=
+LIBS	:=
 OBJS	:=
+
+# Load the make rules generated by configure
+include config.mak
 
 # Load the build rules & settings for the chosen backend
 -include build.rules

Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- configure	20 May 2003 10:15:38 -0000	1.18
+++ configure	20 May 2003 10:24:24 -0000	1.19
@@ -391,8 +391,8 @@
 cat > config.mak << EOF
 # -------- Generated by configure -----------
 
-CXX = $CXX
-LIBS = $LIBS
-RANLIB = $_ranlib
+CXX := $CXX
+LIBS := $LIBS
+RANLIB := $_ranlib
 
 EOF