# HG changeset patch
# User Jonathan Schleifer <js@h3c.de>
# Date 1190660342 -7200
# Node ID d329ff59a25f5a7df9db15855134d833067b48c5
# Parent  1adfd05736a58e6b4d17bf3ea0a32190881c641a# Parent  528877ebbea2c05ca0cdd4c14dd1374feb2bb3c0
Automated merge with ssh://hg.atheme-project.org//hg/audacious-plugins

diff -r 1adfd05736a5 -r d329ff59a25f src/paranormal/Makefile
--- a/src/paranormal/Makefile	Mon Sep 24 20:58:46 2007 +0200
+++ b/src/paranormal/Makefile	Mon Sep 24 20:59:02 2007 +0200
@@ -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 1adfd05736a5 -r d329ff59a25f src/paranormal/cfg.c
--- a/src/paranormal/cfg.c	Mon Sep 24 20:58:46 2007 +0200
+++ b/src/paranormal/cfg.c	Mon Sep 24 20:59:02 2007 +0200
@@ -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 1adfd05736a5 -r d329ff59a25f src/paranormal/libcalc/Makefile
--- a/src/paranormal/libcalc/Makefile	Mon Sep 24 20:58:46 2007 +0200
+++ b/src/paranormal/libcalc/Makefile	Mon Sep 24 20:59:02 2007 +0200
@@ -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 1adfd05736a5 -r d329ff59a25f src/paranormal/paranormal.c
--- a/src/paranormal/paranormal.c	Mon Sep 24 20:58:46 2007 +0200
+++ b/src/paranormal/paranormal.c	Mon Sep 24 20:59:02 2007 +0200
@@ -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 1adfd05736a5 -r d329ff59a25f src/paranormal/plugin.c
--- a/src/paranormal/plugin.c	Mon Sep 24 20:58:46 2007 +0200
+++ b/src/paranormal/plugin.c	Mon Sep 24 20:59:02 2007 +0200
@@ -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>
diff -r 1adfd05736a5 -r d329ff59a25f src/projectm/Makefile
--- a/src/projectm/Makefile	Mon Sep 24 20:58:46 2007 +0200
+++ b/src/projectm/Makefile	Mon Sep 24 20:59:02 2007 +0200
@@ -1,16 +1,10 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
-
-OBJECTIVE_LIBS = libprojectm$(SHARED_SUFFIX)
-
-LIBDIR = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR)
+PLUGIN = projectm$(PLUGIN_SUFFIX)
+plugindir = audacious/$(VISUALIZATION_PLUGIN_DIR)
+SRCS = main.c video_init.c
 
-LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(SDL_LIBS) $(LIBPROJECTM_LIBS) -lprojectM
-
-SOURCES = main.c video_init.c
+include ../../buildsys.mk
+include ../../extra.mk
 
-OBJECTS = ${SOURCES:.c=.o}
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) $(SDL_CFLAGS) $(LIBPROJECTM_CFLAGS) -I../../intl -I../..
-
-include ../../mk/objective.mk
+LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(SDL_LIBS) $(LIBPROJECTM_LIBS) -lprojectM
+CFLAGS += $(PLUGIN_CFLAGS)
+CPPFLAGS += $(PLUGIN_CPPFLAGS) $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) $(SDL_CFLAGS) $(LIBPROJECTM_CFLAGS) -I../../intl -I../..