# HG changeset patch
# User Jonathan Schleifer <js@h3c.de>
# Date 1190655147 -7200
# Node ID 8fee3d70029a388e7f9e3c50c05fb4410aafd329
# Parent  ea0dea2cc2a57faefa643a87775250a8a3a700b1# Parent  c66d632520d1c7a39d416a92b6c2612c88df14ed
Automated merge with ssh://hg.atheme-project.org//hg/audacious-plugins

diff -r ea0dea2cc2a5 -r 8fee3d70029a src/OSS4/Makefile
--- a/src/OSS4/Makefile	Mon Sep 24 19:32:10 2007 +0200
+++ b/src/OSS4/Makefile	Mon Sep 24 19:32:27 2007 +0200
@@ -6,7 +6,7 @@
        init.c		\
        convert.c
 
-plugindir = audacious/${INPUT_PLUGIN_DIR}
+plugindir = audacious/${OUTPUT_PLUGIN_DIR}
 
 include ../../buildsys.mk
 include ../../extra.mk
diff -r ea0dea2cc2a5 -r 8fee3d70029a src/aosd/Makefile
--- a/src/aosd/Makefile	Mon Sep 24 19:32:10 2007 +0200
+++ b/src/aosd/Makefile	Mon Sep 24 19:32:27 2007 +0200
@@ -1,18 +1,15 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
+include ../../extra.mk
 
-OBJECTIVE_LIBS = libaosd$(SHARED_SUFFIX)
+PLUGIN = aosd$(PLUGIN_SUFFIX)
+plugindir = audacious/$(GENERAL_PLUGIN_DIR)
 
 noinst_HEADERS = aosd.h aosd_osd.h aosd_style.h aosd_style_private.h aosd_trigger.h aosd_trigger_private.h aosd_ui.h aosd_cfg.h aosd_common.h ghosd.h ghosd-internal.h
 
-LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR)
+SRCS = aosd.c aosd_osd.c aosd_style.c aosd_trigger.c aosd_ui.c aosd_cfg.c ghosd.c ghosd-main.c
 
-LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(CAIRO_LIBS) $(PANGOCAIRO_LIBS) $(XRENDER_LIBS) $(XCOMPOSITE_LIBS)
-SOURCES = aosd.c aosd_osd.c aosd_style.c aosd_trigger.c aosd_ui.c aosd_cfg.c ghosd.c ghosd-main.c
+include ../../buildsys.mk
 
-OBJECTS = ${SOURCES:.c=.o}
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(CAIRO_CFLAGS) $(PANGOCAIRO_CFLAGS) $(XRENDER_CFLAGS) $(XCOMPOSITE_CFLAGS) \
-	-I../../intl -I../.. -I..
-
-include ../../mk/objective.mk
+LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(CAIRO_LIBS) $(PANGOCAIRO_LIBS) $(XRENDER_LIBS) $(XCOMPOSITE_LIBS)
+CFLAGS += $(PLUGIN_CFLAGS)
+CPPFLAGS += $(PLUGIN_CPPFLAGS) $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(CAIRO_CFLAGS) $(PANGOCAIRO_CFLAGS) \
+	$(XRENDER_CFLAGS) $(XCOMPOSITE_CFLAGS) -I../../intl -I../.. -I..
diff -r ea0dea2cc2a5 -r 8fee3d70029a src/scrobbler/Makefile
--- a/src/scrobbler/Makefile	Mon Sep 24 19:32:10 2007 +0200
+++ b/src/scrobbler/Makefile	Mon Sep 24 19:32:27 2007 +0200
@@ -1,20 +1,11 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
-
-SUBDIRS = 
-
-OBJECTIVE_LIBS = libscrobbler$(SHARED_SUFFIX)
-
-imagesdir = $(datadir)/audacious/images
+include ../../extra.mk
 
-OBJECTIVE_DATA = audioscrobbler.png:$(imagesdir)	\
-	   audioscrobbler_badge.png:$(imagesdir)
+PLUGIN = scrobbler$(SHARED_SUFFIX)
+plugindir = audacious/$(GENERAL_PLUGIN_DIR)
 
-LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR)
+DATA = images/audioscrobbler.png images/audioscrobbler_badge.png
 
-LIBADD += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(CURL_LIBS) $(MUSICBRAINZ_LIBS)
-
-SOURCES = 			\
+SRCS = 			\
 	fmt.c			\
 	configure.c		\
 	gtkstuff.c		\
@@ -23,8 +14,13 @@
 	gerpok.c		\
 	plugin.c
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(BEEP_DEFINES) $(CURL_CFLAGS) -I../../intl -I../.. -Wall
+include ../../buildsys.mk
+
+# XXX: used to get install paths right
+PACKAGE = audacious
 
-OBJECTS = ${SOURCES:.c=.o}
+CFLAGS += $(PLUGIN_CFLAGS)
+CPPFLAGS += $(PLUGIN_CPPFLAGS) $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(BEEP_DEFINES) $(CURL_CFLAGS) \
+	-I../../intl -I../..
+LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(CURL_LIBS) $(MUSICBRAINZ_LIBS)
 
-include ../../mk/objective.mk
diff -r ea0dea2cc2a5 -r 8fee3d70029a src/scrobbler/audioscrobbler.png
Binary file src/scrobbler/audioscrobbler.png has changed
diff -r ea0dea2cc2a5 -r 8fee3d70029a src/scrobbler/audioscrobbler_badge.png
Binary file src/scrobbler/audioscrobbler_badge.png has changed
diff -r ea0dea2cc2a5 -r 8fee3d70029a src/scrobbler/images/audioscrobbler.png
Binary file src/scrobbler/images/audioscrobbler.png has changed
diff -r ea0dea2cc2a5 -r 8fee3d70029a src/scrobbler/images/audioscrobbler_badge.png
Binary file src/scrobbler/images/audioscrobbler_badge.png has changed