# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1190661588 18000
# Node ID 224ae16453ef277ad11644b16ef0b6312e5ef5e1
# Parent  e0f6efc6b08cf9d5b2bb5c3b0005683238e99067# Parent  67f2286e2f12bbdd4016f911fe6f3c2a981e60fa
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins

diff -r e0f6efc6b08c -r 224ae16453ef buildsys.mk.in
--- a/buildsys.mk.in	Mon Sep 24 14:19:35 2007 -0500
+++ b/buildsys.mk.in	Mon Sep 24 14:19:48 2007 -0500
@@ -76,7 +76,7 @@
 
 all:
 	for i in subdirs depend ${OBJS} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${LIB} ${LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST}; do \
-		${MAKE} ${MFLAGS} $$i; \
+		${MAKE} ${MFLAGS} $$i || exit 1; \
 	done
 
 subdirs:
diff -r e0f6efc6b08c -r 224ae16453ef src/rootvis/Makefile
--- a/src/rootvis/Makefile	Mon Sep 24 14:19:35 2007 -0500
+++ b/src/rootvis/Makefile	Mon Sep 24 14:19:48 2007 -0500
@@ -1,22 +1,16 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
-
-OBJECTIVE_LIBS = librootvis.so
-
-CFLAGS += -I. $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(IMLIB2_CFLAGS)
-
-LIBDIR = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR)
-
-LIBADD += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(IMLIB2_LIBS)
+PLUGIN = rootvis${PLUGIN_SUFFIX}
+SRCS = config_backend.c			\
+       config_definition.c		\
+       config_frontend.c		\
+       config_frontend_widgets.c	\
+       getroot.c			\
+       rootvis.c
 
-SOURCES = \
-	config_backend.c \
-	config_definition.c \
-	config_frontend.c \
-	config_frontend_widgets.c \
-	getroot.c \
-	rootvis.c
+plugindir = audacious/${VISUALIZATION_PLUGIN_DIR}
 
-OBJECTS = ${SOURCES:.c=.o}
+include ../../buildsys.mk
+include ../../extra.mk
 
-include ../../mk/objective.mk
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} -I. ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${IMLIB2_CFLAGS}
+CFLAGS += ${PLUGIN_CFLAGS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${IMLIB2_LIBS}