# HG changeset patch
# User Jonathan Schleifer <js@h3c.de>
# Date 1190659666 -7200
# Node ID 256f65a37e1518d7e06f9f6977f9275a3c408dfb
# Parent  5665b04a6cfdfd6763b2141122978f14f590905a# Parent  8b5fbdd98c0e3ef77991d92ae173fb6105ca1a2d
Automated merge with ssh://hg.atheme-project.org//hg/audacious-plugins

diff -r 5665b04a6cfd -r 256f65a37e15 src/blur_scope/Makefile
--- a/src/blur_scope/Makefile	Mon Sep 24 20:47:25 2007 +0200
+++ b/src/blur_scope/Makefile	Mon Sep 24 20:47:46 2007 +0200
@@ -1,16 +1,11 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
+PLUGIN = blur_scope${PLUGIN_SUFFIX}
+SRCS = blur_scope.c config.c
 
-OBJECTIVE_LIBS = libbscope$(SHARED_SUFFIX)
-
-LIBDIR = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR)
+plugindir = audacious/${VISUALIZATION_PLUGIN_DIR}
 
-LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
-
-SOURCES = blur_scope.c config.c
+include ../../buildsys.mk
+include ../../extra.mk
 
-OBJECTS = ${SOURCES:.c=.o}
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
-
-include ../../mk/objective.mk
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
+CFLAGS += ${PLUGIN_CFLAGS}
+LIBADD = ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r 5665b04a6cfd -r 256f65a37e15 src/blur_scope/blur_scope.c
--- a/src/blur_scope/blur_scope.c	Mon Sep 24 20:47:25 2007 +0200
+++ b/src/blur_scope/blur_scope.c	Mon Sep 24 20:47:46 2007 +0200
@@ -15,14 +15,11 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  w
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
+#include "config.h"
 
 #include <glib.h>
 #include <audacious/i18n.h>
diff -r 5665b04a6cfd -r 256f65a37e15 src/blur_scope/config.c
--- a/src/blur_scope/config.c	Mon Sep 24 20:47:25 2007 +0200
+++ b/src/blur_scope/config.c	Mon Sep 24 20:47:46 2007 +0200
@@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
+#include "config.h"
 
 #include <glib.h>
 #include <audacious/i18n.h>
diff -r 5665b04a6cfd -r 256f65a37e15 src/rocklight/Makefile
--- a/src/rocklight/Makefile	Mon Sep 24 20:47:25 2007 +0200
+++ b/src/rocklight/Makefile	Mon Sep 24 20:47:46 2007 +0200
@@ -1,16 +1,11 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
+PLUGIN = rocklight${PLUGIN_SUFFIX}
+SRCS = rocklight.c sysled.c thinklight.c
 
-OBJECTIVE_LIBS = librocklight$(SHARED_SUFFIX)
-
-LIBDIR = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR)
+plugindir = audacious/${VISUALIZATION_PLUGIN_DIR}
 
-LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
-
-SOURCES = rocklight.c thinklight.c sysled.c
+include ../../buildsys.mk
+include ../../extra.mk
 
-OBJECTS = ${SOURCES:.c=.o}
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
-
-include ../../mk/objective.mk
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
+CFLAGS += ${PLUGIN_CFLAGS}
+LIBADD = ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r 5665b04a6cfd -r 256f65a37e15 src/spectrum/Makefile
--- a/src/spectrum/Makefile	Mon Sep 24 20:47:25 2007 +0200
+++ b/src/spectrum/Makefile	Mon Sep 24 20:47:46 2007 +0200
@@ -1,16 +1,11 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
+PLUGIN = spectrum${PLUGIN_SUFFIX}
+SRCS = spectrum.c
 
-OBJECTIVE_LIBS = libspectrum$(SHARED_SUFFIX)
-
-LIBDIR = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR)
+plugindir = audacious/${VISUALIZATION_PLUGIN_DIR}
 
-LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
-
-SOURCES = spectrum.c
+include ../../buildsys.mk
+include ../../extra.mk
 
-OBJECTS = ${SOURCES:.c=.o}
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
-
-include ../../mk/objective.mk
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
+CFLAGS += ${PLUGIN_CFLAGS}
+LIBADD = ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}