# HG changeset patch # User js # Date 1160253075 25200 # Node ID d1b88145846f30e27b1dc1ffbd717194dc820c46 # Parent 7d0cd3fab6a268c5cf4b7abf96353338970649a5 [svn] - Replace ?= at CFLAGS, CPPFLAGS and CXXFLAGS with += - Replace ?= at CC, CPP and CXX with = The reason for this is that on some systems CC, CFLAGS, CPP, CPPFLAGS, CXX and CXXFLAGS are set by default and therefore are already set at this step so that it can happen that the wrong variables are used (or the ones from the configure script are ignored). diff -r 7d0cd3fab6a2 -r d1b88145846f ChangeLog --- a/ChangeLog Fri Oct 06 10:50:55 2006 -0700 +++ b/ChangeLog Sat Oct 07 13:31:15 2006 -0700 @@ -1,3 +1,13 @@ +2006-10-06 17:50:55 +0000 Yoshiki Yazawa + revision [2639] + - mtime=-1 has been introduced to represent "uninitialized". + - scanning for uninitialized tuple works correctly. + - "Update View" works again. + + trunk/audacious/playlist.c | 21 ++++++++++++--------- + 1 file changed, 12 insertions(+), 9 deletions(-) + + 2006-10-06 05:41:09 +0000 William Pitcock revision [2637] - actually, apparently we need that... fucking apple diff -r 7d0cd3fab6a2 -r d1b88145846f mk/rules.mk.in --- a/mk/rules.mk.in Fri Oct 06 10:50:55 2006 -0700 +++ b/mk/rules.mk.in Sat Oct 07 13:31:15 2006 -0700 @@ -83,17 +83,17 @@ BUILDERS_LDFLAGS ?= @BUILDERS_LDFLAGS@ BUILD_INCLUDED_LIBINTL ?= @BUILD_INCLUDED_LIBINTL@ CATOBJEXT ?= @CATOBJEXT@ -CC ?= @CC@ +CC = @CC@ CCAS ?= @CCAS@ CCASFLAGS ?= @CCASFLAGS@ CCDEPMODE ?= @CCDEPMODE@ -CFLAGS ?= @CFLAGS@ -CPP ?= @CPP@ -CPPFLAGS ?= @CPPFLAGS@ -CXX ?= @CXX@ +CFLAGS += @CFLAGS@ +CPP = @CPP@ +CPPFLAGS += @CPPFLAGS@ +CXX = @CXX@ CXXCPP ?= @CXXCPP@ CXXDEPMODE ?= @CXXDEPMODE@ -CXXFLAGS ?= @CXXFLAGS@ +CXXFLAGS += @CXXFLAGS@ CYGPATH_W ?= @CYGPATH_W@ DATADIRNAME ?= @DATADIRNAME@ DCT64 ?= @DCT64@