[patch] Updated patch for the Makefiles

atanks-4.2-build.patch (text/plain), 7.98 KB, created by Andy Kittner on 2010-01-09 12:08:33 UTC

 Makefile     |   45 +++++++++++++++++++++----------------------
 src/Makefile |   60 +++++++++++++++++++++++++++------------------------------
 2 files changed, 50 insertions(+), 55 deletions(-)

diff --git a/Makefile b/Makefile
index cf0f1fd..5a1655b 100644
--- a/Makefile
+++ b/Makefile
@@ -13,34 +13,33 @@ export INSTALLDIR
 FILENAME=atanks-${VERSION}
 INSTALL=$(PREFIX)bin/install -c
 DISTCOMMON=atanks/*.dat atanks/COPYING atanks/README atanks/TODO atanks/Changelog atanks/BUGS atanks/*.txt
-INCOMMON=COPYING README TODO Changelog *.txt unicode.dat
+INCOMMON=*.txt unicode.dat
 
 all:
 	FLAGS=-DLINUX $(MAKE) -C src
 
 install: system
-	mkdir -p ${BINDIR}
-	$(INSTALL) -g 0 -m 755 -o 0 atanks ${BINDIR}
-	mkdir -p ${INSTALLDIR}
-	mkdir -p ${INSTALLDIR}/button
-	mkdir -p ${INSTALLDIR}/misc
-	mkdir -p ${INSTALLDIR}/missile
-	mkdir -p ${INSTALLDIR}/sound
-	mkdir -p ${INSTALLDIR}/stock
-	mkdir -p ${INSTALLDIR}/tank
-	mkdir -p ${INSTALLDIR}/tankgun
-	mkdir -p ${INSTALLDIR}/title
-	mkdir -p ${INSTALLDIR}/text
-	$(INSTALL) -g 0 -m 644 -o 0 $(INCOMMON) ${INSTALLDIR}
-	$(INSTALL) -g 0 -m 644 -o 0 button/* ${INSTALLDIR}/button
-	$(INSTALL) -g 0 -m 644 -o 0 misc/* ${INSTALLDIR}/misc
-	$(INSTALL) -g 0 -m 644 -o 0 missile/* ${INSTALLDIR}/missile
-	$(INSTALL) -g 0 -m 644 -o 0 sound/* ${INSTALLDIR}/sound
-	$(INSTALL) -g 0 -m 644 -o 0 stock/* ${INSTALLDIR}/stock
-	$(INSTALL) -g 0 -m 644 -o 0 tank/* ${INSTALLDIR}/tank
-	$(INSTALL) -g 0 -m 644 -o 0 tankgun/* ${INSTALLDIR}/tankgun
-	$(INSTALL) -g 0 -m 644 -o 0 title/* ${INSTALLDIR}/title
-	$(INSTALL) -g 0 -m 644 -o 0 text/* ${INSTALLDIR}/text
+	$(INSTALL) -d ${DESTDIR}${BINDIR} \
+		${DESTDIR}${INSTALLDIR}/button \
+		${DESTDIR}${INSTALLDIR}/misc \
+		${DESTDIR}${INSTALLDIR}/missile \
+		${DESTDIR}${INSTALLDIR}/sound \
+		${DESTDIR}${INSTALLDIR}/stock \
+		${DESTDIR}${INSTALLDIR}/tank \
+		${DESTDIR}${INSTALLDIR}/tankgun \
+		${DESTDIR}${INSTALLDIR}/title \
+		${DESTDIR}${INSTALLDIR}/text
+	$(INSTALL) -g 0 -m 755 -o 0 atanks ${DESTDIR}${BINDIR}
+	$(INSTALL) -g 0 -m 644 -o 0 $(INCOMMON) ${DESTDIR}${INSTALLDIR}
+	$(INSTALL) -g 0 -m 644 -o 0 button/* ${DESTDIR}${INSTALLDIR}/button
+	$(INSTALL) -g 0 -m 644 -o 0 misc/* ${DESTDIR}${INSTALLDIR}/misc
+	$(INSTALL) -g 0 -m 644 -o 0 missile/* ${DESTDIR}${INSTALLDIR}/missile
+	$(INSTALL) -g 0 -m 644 -o 0 sound/* ${DESTDIR}${INSTALLDIR}/sound
+	$(INSTALL) -g 0 -m 644 -o 0 stock/* ${DESTDIR}${INSTALLDIR}/stock
+	$(INSTALL) -g 0 -m 644 -o 0 tank/* ${DESTDIR}${INSTALLDIR}/tank
+	$(INSTALL) -g 0 -m 644 -o 0 tankgun/* ${DESTDIR}${INSTALLDIR}/tankgun
+	$(INSTALL) -g 0 -m 644 -o 0 title/* ${DESTDIR}${INSTALLDIR}/title
+	$(INSTALL) -g 0 -m 644 -o 0 text/* ${DESTDIR}${INSTALLDIR}/text
 
 system: 
 	FLAGS=-DLINUX $(MAKE) -C src -f Makefile.system
diff --git a/src/Makefile b/src/Makefile
index 29f1b57..04d7ab7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,20 +4,16 @@ MODULES = atanks.o beam.o button.o environment.o explosion.o fade.o files.o glob
           missile.o perlin.o physobj.o player.o satellite.o sky.o tank.o team.o teleport.o virtobj.o \
           update.o network.o floattext.o land.o text.o client.o
 
-CPP=g++
-CC=gcc
-LD=g++
 LIB=ar
 WINDRES=
-FLAGS += -DDATA_DIR=\".\" -Wno-write-strings -DNETWORK -DTHREADS
-#FLAGS += -DDATA_DIR=\"${INSTALLDIR}\"  -Wno-write-strings
+FLAGS += -DDATA_DIR=\"${INSTALLDIR}\"  -Wno-write-strings -DNETWORK -DTHREADS
 OUTPUT = ../atanks
 WFLAGS = 
 OFLAGS = 
 LFLAGS +=
-LDFLAGS =  `allegro-config --libs`
+LDFLAGS += `allegro-config --libs`
 
-CFLAGS += -g -Wall -Iinclude # -fprofile-arcs -ftest-coverage 
+CXXFLAGS += -g -Wall -Iinclude # -fprofile-arcs -ftest-coverage
 
 SRCS  = $(MODULES:.o=.cpp)
 GLOBALS	= main.h imagedefs.h externs.h
@@ -33,79 +29,79 @@ veryclean: clean
 $(MODULES): Makefile
 
 atanks.o: atanks.cpp globals.h main.h menucontent.h
-	$(CPP) -c atanks.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
+	$(CXX) -c atanks.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
 
 button.o: button.cpp button.h
-	$(CPP) -c button.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
+	$(CXX) -c button.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
 
 client.o: client.h client.cpp
-	$(CPP) -c client.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGSS) $(CFLAGS)
+	$(CXX) -c client.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGSS) $(CFLAGS)
 
 environment.o: environment.cpp environment.h
-	$(CPP) -c environment.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
+	$(CXX) -c environment.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
 
 explosion.o: explosion.cpp explosion.h
-	$(CPP) -c explosion.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
+	$(CXX) -c explosion.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
 
 files.o: files.cpp files.h text.h text.cpp
-	$(CPP) -c files.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
+	$(CXX) -c files.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
 
 floattext.o: floattext.cpp floattext.h
-	$(CPP) -c floattext.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
+	$(CXX) -c floattext.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
 
 globaldata.o: globaldata.cpp globaldata.h
-	$(CPP) -c globaldata.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
+	$(CXX) -c globaldata.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
 
 land.o: land.cpp land.h globaldata.h environment.h
-	$(CPP) -c land.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
+	$(CXX) -c land.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
 
 missile.o: missile.cpp missile.h
-	$(CPP) -c missile.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
+	$(CXX) -c missile.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
 
 teleport.o: teleport.cpp teleport.h
-	$(CPP) -c teleport.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
+	$(CXX) -c teleport.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
 
 physobj.o: physobj.cpp physobj.h
-	$(CPP) -c physobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
+	$(CXX) -c physobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
 
 player.o: player.cpp player.h
-	$(CPP) -c player.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
+	$(CXX) -c player.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
 
 tank.o: tank.cpp tank.h
-	$(CPP) -c tank.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
+	$(CXX) -c tank.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
 
 team.o: team.cpp team.h
-	$(CPP) -c team.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
+	$(CXX) -c team.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
 
 virtobj.o: virtobj.cpp virtobj.h
-	$(CPP) -c virtobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
+	$(CXX) -c virtobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
 
 fade.o: fade.cpp
-	$(CPP) -c fade.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
+	$(CXX) -c fade.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
 
 perlin.o: perlin.cpp
-	$(CPP) -c perlin.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
+	$(CXX) -c perlin.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
 
 sky.o: sky.cpp sky.h
-	$(CPP) -c sky.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
+	$(CXX) -c sky.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
 
 satellite.o: satellite.cpp satellite.h
-	$(CPP) -c satellite.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
+	$(CXX) -c satellite.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
 
 text.o: text.cpp text.h
-	$(CPP) -c text.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
+	$(CXX) -c text.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
 
 update.o: update.cpp update.h
-	$(CPP) -c update.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
+	$(CXX) -c update.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
 
 network.o: network.cpp network.h
-	$(CPP) -c network.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
+	$(CXX) -c network.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
 
 %.o: %.cpp %.h
-	$(CPP) -c $< -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
+	$(CXX) -c $< -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
 
 $(OUTPUT): $(OBJECTS) $(MODULES)
-	$(CPP) $(MODULES) -o $(OUTPUT) $(FLAGS) $(LFLAGS) $(LDFLAGS) $(SFLAGS) $(CFLAGS)
+	$(CXX) $(MODULES) -o $(OUTPUT) $(FLAGS) $(LFLAGS) $(LDFLAGS) $(SFLAGS) $(CXXFLAGS)
 	# strip $(OUTPUT)
 
 # dependencies: