# HG changeset patch
# User Jonathan Schleifer <js@h3c.de>
# Date 1190654399 -7200
# Node ID ea7ec02f2ea2b2f14109fcbdaea35ee7f73ccbc0
# Parent  2d37dbee0d12e8741f109010416b0290ccb14d97# Parent  de1511c4ab1959d0199bc87b1693c32965acd60a
Automated merge with ssh://hg.atheme-project.org//hg/audacious-plugins

diff -r 2d37dbee0d12 -r ea7ec02f2ea2 src/esd/Makefile
--- a/src/esd/Makefile	Mon Sep 24 19:19:41 2007 +0200
+++ b/src/esd/Makefile	Mon Sep 24 19:19:59 2007 +0200
@@ -1,18 +1,15 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
+include ../../extra.mk
 
-OBJECTIVE_LIBS = libESD$(SHARED_SUFFIX)
+PLUGIN = ESD$(PLUGIN_SUFFIX)
+plugindir = audacious/$(OUTPUT_PLUGIN_DIR)
 
-noinst_HEADERS = esdout.h
+SRCS = esd.c mixer.c about.c configure.c audio.c init.c
 
-LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
+include ../../buildsys.mk
 
-LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(ESD_LIBS) $(OSS_LIBS)
-SOURCES = esd.c mixer.c about.c configure.c audio.c init.c
+LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(ESD_LIBS) $(OSS_LIBS)
 
-OBJECTS = ${SOURCES:.c=.o}
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ESD_CFLAGS) \
+CFLAGS += $(PLUGIN_CFLAGS)
+CPPFLAGS += $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ESD_CFLAGS) \
 	-I../../intl -I../.. -I..
 
-include ../../mk/objective.mk
diff -r 2d37dbee0d12 -r ea7ec02f2ea2 src/esd/esdout.h
--- a/src/esd/esdout.h	Mon Sep 24 19:19:41 2007 +0200
+++ b/src/esd/esdout.h	Mon Sep 24 19:19:59 2007 +0200
@@ -22,9 +22,7 @@
 #ifndef ESDOUT_H
 #define ESDOUT_H
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
+#include "config.h"
 
 #include <glib.h>
 
diff -r 2d37dbee0d12 -r ea7ec02f2ea2 src/null/Makefile
--- a/src/null/Makefile	Mon Sep 24 19:19:41 2007 +0200
+++ b/src/null/Makefile	Mon Sep 24 19:19:59 2007 +0200
@@ -1,15 +1,13 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
+include ../../extra.mk
 
-OBJECTIVE_LIBS = libnull${SHARED_SUFFIX}
+PLUGIN = null${PLUGIN_SUFFIX}
+plugindir = audacious/${OUTPUT_PLUGIN_DIR}
 
-LIBDIR = ${plugindir}/${OUTPUT_PLUGIN_DIR}
+SRCS = null.c
 
-SOURCES = null.c
-
-OBJECTS = ${SOURCES:.c=.o}
+include ../../buildsys.mk
 
-CFLAGS += ${PICFLAGS} \
-	-I../..
+CFLAGS += ${PLUGIN_CFLAGS}
+CPPFLAGS += ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${DBUS_CFLAGS} ${MOWGLI_CFLAGS} -I../..
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
 
-include ../../mk/objective.mk