diff options
| author | Max Horn | 2003-05-20 10:24:24 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-20 10:24:24 +0000 |
| commit | 79cc9c6a2f4ebd4f0c94a09a5db256c7fa4a9409 (patch) | |
| tree | f03a0db5da48185aa0aa835c8ce4fd067b296d2a | |
| parent | ad92ffa06daf023d175a69cd93840b31e33f883a (diff) | |
| download | scummvm-rg350-79cc9c6a2f4ebd4f0c94a09a5db256c7fa4a9409.tar.gz scummvm-rg350-79cc9c6a2f4ebd4f0c94a09a5db256c7fa4a9409.tar.bz2 scummvm-rg350-79cc9c6a2f4ebd4f0c94a09a5db256c7fa4a9409.zip | |
let config.mak overwrite the default values (defensive coding style :-)
svn-id: r7715
| -rw-r--r-- | Makefile.new | 11 | ||||
| -rwxr-xr-x | configure | 6 |
2 files changed, 9 insertions, 8 deletions
diff --git a/Makefile.new b/Makefile.new index 459b2b5249..1dddcbbcdd 100644 --- a/Makefile.new +++ b/Makefile.new @@ -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,9 +21,12 @@ CXXFLAGS:= -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-m 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 @@ -391,8 +391,8 @@ echo "Creating config.mak" cat > config.mak << EOF # -------- Generated by configure ----------- -CXX = $CXX -LIBS = $LIBS -RANLIB = $_ranlib +CXX := $CXX +LIBS := $LIBS +RANLIB := $_ranlib EOF |