diff src/cdaudio-ng/Makefile @ 1862:d9d4b258fbf1

Millions of Makefile fixes. More to follow.

--- a/src/cdaudio-ng/Makefile	Mon Sep 24 22:35:27 2007 +0200
+++ b/src/cdaudio-ng/Makefile	Mon Sep 24 23:03:25 2007 +0200
@@ -1,13 +1,12 @@
+PLUGIN = cdaudio-ng${PLUGIN_SUFFIX}
+SRCS = cdaudio-ng.c	\
+       configure.c
+
+plugindir = audacious/${INPUT_PLUGIN_DIR}
+
+include ../../buildsys.mk
 include ../../extra.mk
 
-PLUGIN = cdaudio-ng$(PLUGIN_SUFFIX)
-plugindir = audacious/$(INPUT_PLUGIN_DIR)
-
-SRCS = cdaudio-ng.c configure.c
-
-include ../../buildsys.mk
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) -Wall
-CPPFLAGS = $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(CDIO_CFLAGS) $(CDDB_CFLAGS) -I../..
-LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(CDIO_LIBS) $(CDDB_LIBS)
-
+CPPFLAGS = ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${CDIO_CFLAGS} ${CDDB_CFLAGS} -I../.. ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES}
+CFLAGS += ${PLUGIN_CFLAGS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${CDIO_LIBS} ${CDDB_LIBS}