# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1190654935 18000
# Node ID a895337fbc2fa76c645d4296d52f6ac952db6f70
# Parent  292affbb8153b1a620176e1b6d679580020b8d36
aosd: Mk2

diff -r 292affbb8153 -r a895337fbc2f src/aosd/Makefile
--- a/src/aosd/Makefile	Mon Sep 24 12:25:00 2007 -0500
+++ b/src/aosd/Makefile	Mon Sep 24 12:28:55 2007 -0500
@@ -1,18 +1,15 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
+include ../../extra.mk
 
-OBJECTIVE_LIBS = libaosd$(SHARED_SUFFIX)
+PLUGIN = aosd$(PLUGIN_SUFFIX)
+plugindir = audacious/$(GENERAL_PLUGIN_DIR)
 
 noinst_HEADERS = aosd.h aosd_osd.h aosd_style.h aosd_style_private.h aosd_trigger.h aosd_trigger_private.h aosd_ui.h aosd_cfg.h aosd_common.h ghosd.h ghosd-internal.h
 
-LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR)
+SRCS = aosd.c aosd_osd.c aosd_style.c aosd_trigger.c aosd_ui.c aosd_cfg.c ghosd.c ghosd-main.c
 
-LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(CAIRO_LIBS) $(PANGOCAIRO_LIBS) $(XRENDER_LIBS) $(XCOMPOSITE_LIBS)
-SOURCES = aosd.c aosd_osd.c aosd_style.c aosd_trigger.c aosd_ui.c aosd_cfg.c ghosd.c ghosd-main.c
+include ../../buildsys.mk
 
-OBJECTS = ${SOURCES:.c=.o}
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(CAIRO_CFLAGS) $(PANGOCAIRO_CFLAGS) $(XRENDER_CFLAGS) $(XCOMPOSITE_CFLAGS) \
-	-I../../intl -I../.. -I..
-
-include ../../mk/objective.mk
+LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(CAIRO_LIBS) $(PANGOCAIRO_LIBS) $(XRENDER_LIBS) $(XCOMPOSITE_LIBS)
+CFLAGS += $(PLUGIN_CFLAGS)
+CPPFLAGS += $(PLUGIN_CPPFLAGS) $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(CAIRO_CFLAGS) $(PANGOCAIRO_CFLAGS) \
+	$(XRENDER_CFLAGS) $(XCOMPOSITE_CFLAGS) -I../../intl -I../.. -I..