# HG changeset patch
# User Jonathan Schleifer <js@h3c.de>
# Date 1190657008 -7200
# Node ID 7d47a2d1567a04fc801ec16b4f2207801448f9e0
# Parent  b7d43348245d06eb10c063cd79e9ceadf63f829b# Parent  6bc14eddc4c30a3c0c5f641c8ca4fb388eb9bcf0
Automated merge with ssh://hg.atheme-project.org//hg/audacious-plugins

diff -r b7d43348245d -r 7d47a2d1567a src/gnomeshortcuts/Makefile
--- a/src/gnomeshortcuts/Makefile	Mon Sep 24 20:02:43 2007 +0200
+++ b/src/gnomeshortcuts/Makefile	Mon Sep 24 20:03:28 2007 +0200
@@ -1,16 +1,11 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
+PLUGIN = gnomeshortcuts$(PLUGIN_SUFFIX)
+plugindir = audacious/$(GENERAL_PLUGIN_DIR)
 
-OBJECTIVE_LIBS = libgnomeshortcuts$(SHARED_SUFFIX)
+SRCS = gnomeshortcuts.c
 
-LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR)
+include ../../buildsys.mk
+include ../../extra.mk
 
 LIBADD = $(GLIB_LIBS) $(DBUS_LIBS)
-SOURCES = gnomeshortcuts.c
-
-OBJECTS = ${SOURCES:.c=.o}
-
-CFLAGS += $(PICFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
-	-I../../intl -I../.. -I..
-
-include ../../mk/objective.mk
+CFLAGS += $(PLUGIN_CFLAGS)
+CPPFLAGS += $(PLUGIN_CPPFLAGS) $(GTK_CFLAGS) $(MOWGLI_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) -I../../intl -I../.. -I..
diff -r b7d43348245d -r 7d47a2d1567a src/hotkey/Makefile
--- a/src/hotkey/Makefile	Mon Sep 24 20:02:43 2007 +0200
+++ b/src/hotkey/Makefile	Mon Sep 24 20:03:28 2007 +0200
@@ -1,16 +1,11 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
+PLUGIN = hotkey$(PLUGIN_SUFFIX)
+plugindir = audacious/$(GENERAL_PLUGIN_DIR)
 
-OBJECTIVE_LIBS = libhotkey$(SHARED_SUFFIX)
-
-LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR)
+SRCS = plugin.c
 
-LIBADD = $(GTK_LIBS) $(GLIB_LIBS)
-SOURCES = plugin.c
-
-OBJECTS = ${SOURCES:.c=.o}
+include ../../buildsys.mk
+include ../../extra.mk
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) \
-	-I../../intl -I../.. -I..
-
-include ../../mk/objective.mk
+LIBADD = $(GLIB_LIBS) $(DBUS_LIBS)
+CFLAGS += $(PLUGIN_CFLAGS)
+CPPFLAGS += $(PLUGIN_CPPFLAGS) $(GTK_CFLAGS) $(MOWGLI_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) -I../../intl -I../.. -I..
diff -r b7d43348245d -r 7d47a2d1567a src/sndstretch/Makefile
--- a/src/sndstretch/Makefile	Mon Sep 24 20:02:43 2007 +0200
+++ b/src/sndstretch/Makefile	Mon Sep 24 20:03:28 2007 +0200
@@ -1,15 +1,12 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
+PLUGIN = sndstretch$(PLUGIN_SUFFIX)
+plugindir = audacious/$(EFFECT_PLUGIN_DIR)
 
-OBJECTIVE_LIBS = libsndstretch$(SHARED_SUFFIX)
+SRCS = sndstretch_xmms.c sndstretch.c
 
-LIBDIR = $(plugindir)/$(EFFECT_PLUGIN_DIR)
-
-SOURCES = sndstretch_xmms.c sndstretch.c
+include ../../extra.mk
+include ../../buildsys.mk
 
-OBJECTS = ${SOURCES:.c=.o}
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) \
+CFLAGS += $(PLUGIN_CFLAGS)
+CPPFLAGS += $(PLUGIN_CPPFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(MOWGLI_CFLAGS) $(PANGO_CFLAGS) \
 	-I../../intl -I../..
 
-include ../../mk/objective.mk
diff -r b7d43348245d -r 7d47a2d1567a src/wma/Makefile
--- a/src/wma/Makefile	Mon Sep 24 20:02:43 2007 +0200
+++ b/src/wma/Makefile	Mon Sep 24 20:03:28 2007 +0200
@@ -29,4 +29,4 @@
 
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../.. -I./libffwma -std=c99 ${GCC42_CFLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
 CFLAGS += ${PLUGIN_CFLAGS}
-LIBS += ./libffwma/libffwma.a ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}