# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1192849620 -10800
# Node ID 94927e11786e960362a3c1285f3e79b4ac4491e9
# Parent  10a72af488d968a61023dacdb032314fd93f91fc# Parent  df7c8b32c3891031649448f7724fef3cf55a714a
Automated merge with file:/home/ccr/audacious/core

diff -r 10a72af488d9 -r 94927e11786e .hgtags
--- a/.hgtags	Sat Oct 20 06:05:53 2007 +0300
+++ b/.hgtags	Sat Oct 20 06:07:00 2007 +0300
@@ -4,3 +4,4 @@
 e0d1499b428724311766c06e69a288cb10a42b32 audacious-1.4.0-dr3
 e00e1ab06ba63ac4122d2b122b072e299f2ab3f9 audacious-1.4.0-dr3
 45f44e987b127ce4610d9b0c9c3a6463c496f67d audacious-1.4.0-dr3
+2835f4f3f38801e11778570245ddddded73d3102 audacious-1.4.0-beta2
diff -r 10a72af488d9 -r 94927e11786e buildsys.mk.in
--- a/buildsys.mk.in	Sat Oct 20 06:05:53 2007 +0300
+++ b/buildsys.mk.in	Sat Oct 20 06:07:00 2007 +0300
@@ -104,7 +104,7 @@
 			esac; \
 		done; \
 		if test x"$$list" != "x"; then \
-			if ${CPP} ${CPPFLAGS} -M $$list >.deps; then \
+			if ${CC} ${CPPFLAGS} -M $$list >.deps; then \
 				${DEPEND_OK}; \
 			else \
 				${DEPEND_FAILED}; \