[Scummvm-cvs-logs] CVS: scummvm Makefile,1.80,1.81 configure,1.98,1.99

[Jonathan Gray]

Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13445

Modified Files:
	Makefile configure 
Log Message:
Given Makefile now depends on the configure script output move these default parameters out to the configure script

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- Makefile	17 Apr 2004 03:32:03 -0000	1.80
+++ Makefile	27 Jul 2004 12:16:03 -0000	1.81
@@ -1,17 +1,5 @@
 # $Header$
 
-CXX     := c++
-AR      := ar cru
-RANLIB  := ranlib
-MKDIR   := mkdir -p
-ECHO    := printf
-CAT     := cat
-RM      := rm -f
-RM_REC  := $(RM) -r
-ZIP     := zip -q
-CP      := cp
-WIN32PATH=C:/scummvm
-
 #######################################################################
 # Default compilation parameters. Normally don't edit these           #
 #######################################################################

Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- configure	20 Jul 2004 13:42:36 -0000	1.98
+++ configure	27 Jul 2004 12:16:03 -0000	1.99
@@ -2,17 +2,11 @@
 #
 # Some things this script could/should do when finished
 #
-# * detect the compiler name (g++/c++/...)
 # * detect whether its a GNU compiler or not (for compiler settings)
-# * detect the host platform and base settings on this:
-#   - #defines like -DUNIX and -DMACOSX
-#   - required libs like -lmingw32
 # * command line options to...
 #   - override the host settings (for cross compiles
-#   - select the desired backend (sdl, x11, ...)
 #   - whether to do a debug build (with -g) or an optimized build (-O3 etc.)
 # * detect whether the chosen backend is available (e.g. call sdl-config)
-# * generate a config.mak file for use in makefiles
 # * ....
 
 # TODO: We should really use mktemp(1) to determine a random tmp file name.
@@ -47,6 +41,15 @@
 _backend=sdl
 _ranlib=ranlib
 _install=install
+_ar="ar cru"
+_mkdir="mkdir -p"
+_echo=printf
+_cat=cat
+_rm="rm -f"
+_rm_rec="$_rm -r"
+_zip="zip -q"
+_cp=cp
+_win32path="C:/scummvm"
 _sdlconfig=sdl-config
 _sdlpath="$PATH"
 _nasmpath="$PATH"
@@ -1044,6 +1047,16 @@
 LIBS += $LIBS
 RANLIB := $_ranlib
 INSTALL := $_install
+AR := $_ar
+MKDIR := $_mkdir
+ECHO := $_echo
+CAT := $_cat
+RM := $_rm
+RM_REC := $_rm_rec
+ZIP := $_zip
+CP := $_cp
+WIN32PATH=$_win32path
+
 BACKEND := $_backend
 MODULES += $MODULES
 MODULE_DIRS += $MODULE_DIRS