# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1190660258 18000
# Node ID 9082ea1df2b981c4433ce1aede10318efd0f64a8
# Parent  15e7d3473974b10778f1c2e4690b3c122814933a# Parent  256f65a37e1518d7e06f9f6977f9275a3c408dfb
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins

diff -r 256f65a37e15 -r 9082ea1df2b9 src/paranormal/Makefile
--- a/src/paranormal/Makefile	Mon Sep 24 20:47:46 2007 +0200
+++ b/src/paranormal/Makefile	Mon Sep 24 13:57:38 2007 -0500
@@ -1,15 +1,7 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
-
-OBJECTIVE_LIBS = libparanormal$(SHARED_SUFFIX)
+PLUGIN = paranormal$(PLUGIN_SUFFIX)
+plugindir = audacious/$(VISUALIZATION_PLUGIN_DIR)
 
-SUBDIRS = libcalc presets
-
-LIBDIR = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR)
-
-LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(XML_LIBS) $(SDL_LIBS) libcalc/libcalc.a
-
-SOURCES =			\
+SRCS =			\
 	actuators.c		\
 	beatdetect.c		\
 	builtins.c		\
@@ -26,10 +18,14 @@
 	wave.c			\
 	xform.c
 
-OBJECTS = ${SOURCES:.c=.o}
+EXT_DEPS = libcalc/libcalc.a
 
-LIBDEP = libcalc/libcalc.a
+include ../../buildsys.mk
+include ../../extra.mk
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) $(SDL_CFLAGS) -I../../intl -I../..
+SUBDIRS = libcalc presets
 
-include ../../mk/objective.mk
+CFLAGS += $(PLUGIN_CFLAGS)
+CPPFLAGS += $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) $(SDL_CFLAGS) -I../../intl \
+	-I../.. -I.
+LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(XML_LIBS) $(SDL_LIBS) libcalc/libcalc.a
diff -r 256f65a37e15 -r 9082ea1df2b9 src/paranormal/cfg.c
--- a/src/paranormal/cfg.c	Mon Sep 24 20:47:46 2007 +0200
+++ b/src/paranormal/cfg.c	Mon Sep 24 13:57:38 2007 -0500
@@ -1,9 +1,7 @@
 /* FIXME: prevent the user from dragging something above the root
    actuator */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <glib.h>
 #include <gtk/gtk.h>
diff -r 256f65a37e15 -r 9082ea1df2b9 src/paranormal/libcalc/Makefile
--- a/src/paranormal/libcalc/Makefile	Mon Sep 24 20:47:46 2007 +0200
+++ b/src/paranormal/libcalc/Makefile	Mon Sep 24 13:57:38 2007 -0500
@@ -1,16 +1,9 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+STATIC_LIB_NOINST = libcalc.a
 
-OBJECTIVE_LIBS_NOINST = libcalc.a
-
-LIBDIR = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR)
+SRCS = dict.c  execute.c  function.c  parser.c  storage.c
 
-LIBADD = $(GTK_LIBS) $(XML_LIBS) $(SDL_LIBS)
-
-SOURCES = dict.c  execute.c  function.c  parser.c  storage.c
+include ../../../extra.mk
+include ../../../buildsys.mk
 
-OBJECTS = ${SOURCES:.c=.o}
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) $(SDL_CFLAGS) -I../../intl -I../..
-
-include ../../../mk/objective.mk
+CFLAGS += $(PLUGIN_CFLAGS)
+CPPFLAGS += $(PLUGIN_CPPFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) $(SDL_CFLAGS) -I../../intl -I../..
diff -r 256f65a37e15 -r 9082ea1df2b9 src/paranormal/paranormal.c
--- a/src/paranormal/paranormal.c	Mon Sep 24 20:47:46 2007 +0200
+++ b/src/paranormal/paranormal.c	Mon Sep 24 13:57:38 2007 -0500
@@ -1,8 +1,6 @@
 /* FIXME: add fullscreen / screenshots */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff -r 256f65a37e15 -r 9082ea1df2b9 src/paranormal/plugin.c
--- a/src/paranormal/plugin.c	Mon Sep 24 20:47:46 2007 +0200
+++ b/src/paranormal/plugin.c	Mon Sep 24 13:57:38 2007 -0500
@@ -4,9 +4,7 @@
    look for a bug there?
 */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdlib.h>
 #include <stdio.h>