summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2004-02-05 08:22:15 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2004-02-05 08:22:15 +0000
commitc06b1200f7f4ebd439b0eb6d20e17ff586be75ba (patch)
treeeb89cd7118061c42d01ea773c30698d39940857f /media-plugins/xmms-imms/files
parentUpdated makefiles to play nice with user set CFLAGS (diff)
downloadgentoo-2-c06b1200f7f4ebd439b0eb6d20e17ff586be75ba.tar.gz
gentoo-2-c06b1200f7f4ebd439b0eb6d20e17ff586be75ba.tar.bz2
gentoo-2-c06b1200f7f4ebd439b0eb6d20e17ff586be75ba.zip
Updated makefiles to play nice with user set CFLAGS
Diffstat (limited to 'media-plugins/xmms-imms/files')
-rw-r--r--media-plugins/xmms-imms/files/xmms-imms-1.0-makefile.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/media-plugins/xmms-imms/files/xmms-imms-1.0-makefile.patch b/media-plugins/xmms-imms/files/xmms-imms-1.0-makefile.patch
new file mode 100644
index 000000000000..37ecdfe97f94
--- /dev/null
+++ b/media-plugins/xmms-imms/files/xmms-imms-1.0-makefile.patch
@@ -0,0 +1,33 @@
+--- rules.mk.orig 2004-02-04 23:59:29.000000000 -0800
++++ rules.mk 2004-02-04 23:59:53.000000000 -0800
+@@ -11,12 +11,12 @@
+ $(AR) $(ARFLAGS) $@ $(CORE_OBJ)
+
+ %.o: %.cc vars.mk
+- @$(CXX) $(CPPFLAGS) -M -E $< > .$*.d
+- $(CXX) $(CPPFLAGS) -c $< -o $@
++ @$(CXX) $(CPPFLAGS) $(CXXFLAGS) -M -E $< > .$*.d
++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
+
+ %.o: %.c vars.mk
+- @$(CXX) $(CFLAGS) -M -E $< > .$*.d
+- $(CC) $(CFLAGS) -c $< -o $@
++ @$(CC) $(CPPFLAGS) $(CFLAGS) -M -E $< > .$*.d
++ $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
+
+ .PHONY: clean distclean
+
+--- vars.mk.in.orig 2004-02-05 00:07:06.000000000 -0800
++++ vars.mk.in 2004-02-05 00:08:00.000000000 -0800
+@@ -9,8 +9,9 @@
+ CORE_OBJ = imms.o immsdb.o fetcher.o picker.o spectrum.o sqldb.o \
+ songinfo.o regexx.o strmanip.o levenshtein.o xidle.o md5.o
+
+-CFLAGS = `xmms-config --cflags` @DEBUG_CFLAGS@ -Wall -fPIC -D_REENTRANT
+-CPPFLAGS = ${CFLAGS} -pedantic -fno-rtti
++CFLAGS = -Wall -fPIC -D_REENTRANT @CFLAGS@
++CXXFLAGS = -fPIC -D_REENTRANT -pedantic -fno-rtti @CXXFLAGS@
++CPPFLAGS = `xmms-config --cflags` @CPPFLAGS@
+ LDFLAGS = `xmms-config --libs` @LIBS@
+ ARFLAGS = rs
+