diff src/libaudclient/Makefile @ 3572:625af2797f35 trunk

Clean up Makefiles.

--- a/src/libaudclient/Makefile	Wed Sep 19 18:41:39 2007 +0900
+++ b/src/libaudclient/Makefile	Wed Sep 19 17:32:47 2007 +0200
@@ -1,5 +1,3 @@
-include ../../extra.mk
-
 LIB = ${LIB_PREFIX}audclient${LIB_SUFFIX}
 LIB_MAJOR = 1
 LIB_MINOR = 0
@@ -9,25 +7,20 @@
 INCLUDES = audctrl.h
 
 include ../../buildsys.mk
+include ../../extra.mk
 
 depend-hook:
 	cd ../audacious; make dbus-client-bindings.h
 
-LIBS += \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS) \
-	$(MOWGLI_LIBS) \
-	$(GCONF_LIBS) \
-	$(LIBMCS_LIBS)
-
-CFLAGS += $(LIB_CFLAGS) \
-	$(MOWGLI_CFLAGS) \
-	$(GTK_CFLAGS) \
-	$(GCONF_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	$(LIBMCS_CFLAGS) \
-	-D_AUDACIOUS_CORE \
-	-I.. -I../.. \
-	-I../intl
-
-CPPFLAGS = ${CFLAGS}
+CPPFLAGS = ${LIB_CPPFLAGS} ${CFLAGS} -D_AUDACIOUS_CORE -I.. -I../.. -I../intl
+CFLAGS += ${LIB_CFLAGS}		\
+	  ${MOWGLI_CFLAGS}	\
+	  ${GTK_CFLAGS}		\
+	  ${GCONF_CFLAGS}	\
+	  ${DBUS_CFLAGS}	\
+	  ${LIBMCS_CFLAGS}
+LIBS += ${GLIB_LIBS}	\
+	${DBUS_LIBS}	\
+	${MOWGLI_LIBS}	\
+	${GCONF_LIBS}	\
+	${LIBMCS_LIBS}