# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1190653874 18000
# Node ID 5a7c8485736155e4ff7924f13f5259e208302ab0
# Parent  d447ee6c8bc09c6ea49b5e6dfdc823651a8364ff
cdaudio-ng: Mk2

diff -r d447ee6c8bc0 -r 5a7c84857361 src/cdaudio-ng/Makefile
--- a/src/cdaudio-ng/Makefile	Mon Sep 24 12:06:17 2007 -0500
+++ b/src/cdaudio-ng/Makefile	Mon Sep 24 12:11:14 2007 -0500
@@ -1,15 +1,13 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
+include ../../extra.mk
 
-OBJECTIVE_LIBS = libcdaudio-ng$(SHARED_SUFFIX)
+PLUGIN = cdaudio-ng$(PLUGIN_SUFFIX)
+plugindir = audacious/$(INPUT_PLUGIN_DIR)
 
-LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(CDIO_LIBS) $(CDDB_LIBS)
-LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
+SRCS = cdaudio-ng.c configure.c
 
-SOURCES = cdaudio-ng.c configure.c
-
-OBJECTS = ${SOURCES:.c=.o}
+include ../../buildsys.mk
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(CDIO_CFLAGS) $(CDDB_CFLAGS) -I../../intl -I../..
+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)
 
-include ../../mk/objective.mk