Author: ceros-guest
Date: 2008-01-16 07:31:34 +0000 (Wed, 16 Jan 2008)
New Revision: 5401
Modified:
packages/trunk/warsow/debian/patches/makefile_modifications.diff
Log:
Fixing makefile_modifications patch.
Modified: packages/trunk/warsow/debian/patches/makefile_modifications.diff
===================================================================
--- packages/trunk/warsow/debian/patches/makefile_modifications.diff
2008-01-16 07:11:22 UTC (rev 5400)
+++ packages/trunk/warsow/debian/patches/makefile_modifications.diff
2008-01-16 07:31:34 UTC (rev 5401)
@@ -1,8 +1,8 @@
Index: Some makefile modifications, making it more useful in building
Debian packages.
===================================================================
---- ./warsow_0.32/source/Makefile.bak 2008-01-16 01:27:01.000000000 -0500
-+++ ./warsow_0.32/source/Makefile 2008-01-16 02:01:06.000000000 -0500
+--- ./warsow_0.32/source/Makefile.bak 2008-01-16 02:23:55.000000000 -0500
++++ ./warsow_0.32/source/Makefile 2008-01-16 02:25:39.000000000 -0500
@@ -32,7 +32,7 @@
LD=i586-mingw32msvc-gcc
else
@@ -71,22 +71,29 @@
endif # USE_MINGW
# Mac support, hacking this in at the end where it is easier than adding more
if statements throughout
-@@ -182,8 +178,10 @@
+@@ -182,12 +178,13 @@
######################################################################################################
# Helper functions
######################################################################################################
-DO_CC=echo " > Compiling $<" && \
- $(CC) $(CFLAGS_COMMON) -c $< -o $@
+-
+-DO_CC_CLIENT=$(DO_CC) $(CFLAGS_CLIENT)
+-DO_CC_DED=$(DO_CC) $(CFLAGS_DED)
+-DO_CC_MODULE=$(DO_CC) $(CFLAGS_MODULE)
+# Need to adjust this so that all options used are displayed
+# in the build logs.
[EMAIL PROTECTED] "$(CC) $(CFLAGS_COMMON) -c $< -o $@" && \
-+ $(CC) $(CFLAGS_COMMON) -c $< -o $@
++DO_CC=$(CC) $(CFLAGS_COMMON) -c $< -o $@
++
[EMAIL PROTECTED] "$(DO_CC) $(CFLAGS_CLIENT)" && $(DO_CC) $(CFLAGS_CLIENT)
[EMAIL PROTECTED] "$(DO_CC) $(CFLAGS_DED)" && $(DO_CC) $(CFLAGS_DED)
[EMAIL PROTECTED] "$(DO_CC) $(CFLAGS_MODULE)" && $(DO_CC) $(CFLAGS_MODULE)
- DO_CC_CLIENT=$(DO_CC) $(CFLAGS_CLIENT)
- DO_CC_DED=$(DO_CC) $(CFLAGS_DED)
-@@ -439,12 +437,13 @@
######################################################################################################
+@@ -439,12 +436,13 @@
+
+
######################################################################################################
# Linking Rules
+# Need to display all options used for later viewing from build logs.
######################################################################################################
@@ -99,7 +106,7 @@
$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED)
#########
-@@ -452,11 +451,11 @@
+@@ -452,11 +450,11 @@
#########
ifeq ($(OS),Darwin)
$(BINDIR)/$(CLIENT_EXE): $(OBJS_CLIENT)
@@ -113,7 +120,7 @@
$(LD) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
endif
-@@ -464,33 +463,33 @@
+@@ -464,33 +462,33 @@
# OPENAL
#########
$(BINDIR)/libs/snd_openal_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_OPENAL)
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
