# HG changeset patch
# User Jonathan Schleifer <js@h3c.de>
# Date 1190661920 -7200
# Node ID 77a717cd7d1adb89f0455e409cf547848780a95b
# Parent  e3de567a014699ed836620cdccd24945bdf5bd74# Parent  56a0c3edc41014c9a8d4fc9c8c08600b648b8df0
Automated merge with ssh://hg.atheme-project.org//hg/audacious-plugins

diff -r e3de567a0146 -r 77a717cd7d1a src/lastfm/Makefile
--- a/src/lastfm/Makefile	Mon Sep 24 21:25:03 2007 +0200
+++ b/src/lastfm/Makefile	Mon Sep 24 21:25:20 2007 +0200
@@ -1,25 +1,12 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
-
-SUBDIRS = 
+PLUGIN = lastfm$(PLUGIN_SUFFIX)
+plugindir = audacious/$(TRANSPORT_PLUGIN_DIR)
 
-OBJECTIVE_LIBS = liblastfm$(SHARED_SUFFIX)
-
-LIBDIR = $(plugindir)/$(TRANSPORT_PLUGIN_DIR)
-
-LIBADD += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(CURL_LIBS)
-
-SOURCES = lastfm.c
+SRCS = lastfm.c
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(BEEP_DEFINES) $(CURL_CFLAGS) -I../../intl -I../.. -ggdb -g3
+include ../../buildsys.mk
+include ../../extra.mk
 
-CFLAGS += -Wall  -pedantic -std=c99 $(GCC42_CFLAGS)
-#CFLAGS += -Wpointer-arith -Wimplicit -Wnested-externs -Wcast-align \
-#-Wcast-qual -Wstrict-prototypes -Wmissing-prototypes \
-#-Wmissing-declarations -W -Wno-unused -Wshadow -Wmissing-noreturn \
-#-Wundef -Wpacked -Wnested-externs -Wbad-function-cast -Wredundant-decls \
-#-Wfloat-equal -Wdisabled-optimization -pedantic -std=c99
-
-OBJECTS = ${SOURCES:.c=.o}
-
-include ../../mk/objective.mk
+CFLAGS += $(PLUGIN_CFLAGS)
+CPPFLAGS += $(PLUGIN_CPPFLAGS) $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) \
+	$(CURL_CFLAGS) -I../../intl -I../.. -Wall
+LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(XML_LIBS) $(CURL_LIBS)
diff -r e3de567a0146 -r 77a717cd7d1a src/mms/Makefile
--- a/src/mms/Makefile	Mon Sep 24 21:25:03 2007 +0200
+++ b/src/mms/Makefile	Mon Sep 24 21:25:20 2007 +0200
@@ -1,18 +1,12 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
+PLUGIN = mms$(PLUGIN_SUFFIX)
+plugindir = audacious/$(TRANSPORT_PLUGIN_DIR)
 
-OBJECTIVE_LIBS = libmms$(SHARED_SUFFIX)
-
-LIBDIR = $(plugindir)/$(TRANSPORT_PLUGIN_DIR)
-
-SOURCES = mms.c
+SRCS = mms.c
 
-OBJECTS = ${SOURCES:.c=.o}
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(MMS_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
+include ../../buildsys.mk
+include ../../extra.mk
 
-CXXFLAGS = $(CFLAGS)
-
-LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(MMS_LIBS)
-
-include ../../mk/objective.mk
+CFLAGS += $(PLUGIN_CFLAGS)
+CPPFLAGS += $(PLUGIN_CPPFLAGS) $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) \
+	$(MMS_CFLAGS) -I../../intl -I../.. -Wall
+LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(XML_LIBS) $(MMS_LIBS)
diff -r e3de567a0146 -r 77a717cd7d1a src/mtp_up/Makefile
--- a/src/mtp_up/Makefile	Mon Sep 24 21:25:03 2007 +0200
+++ b/src/mtp_up/Makefile	Mon Sep 24 21:25:20 2007 +0200
@@ -1,19 +1,11 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
+PLUGIN = mtp_up${PLUGIN_SUFFIX}
+SRCS = mtp.c filetype.c
 
-SUBDIRS = 
-
-OBJECTIVE_LIBS = libmtp_up$(SHARED_SUFFIX)
-
-LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR)
+plugindir = audacious/${GENERAL_PLUGIN_DIR}
 
-LIBADD += $(MTP_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) 
-SOURCES = mtp.c filetype.c
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(BEEP_DEFINES) -I../../intl -I../..
+include ../../buildsys.mk
+include ../../extra.mk
 
-CFLAGS += -Wall  -pedantic -std=c99 $(GCC42_CFLAGS) -D_BSD_SOURCE
-
-OBJECTS = ${SOURCES:.c=.o}
-
-include ../../mk/objective.mk
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../.. ${MTP_CFLAGS}
+CFLAGS += ${PLUGIN_CFLAGS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MTP_LIBS}
diff -r e3de567a0146 -r 77a717cd7d1a src/neon/Makefile
--- a/src/neon/Makefile	Mon Sep 24 21:25:03 2007 +0200
+++ b/src/neon/Makefile	Mon Sep 24 21:25:20 2007 +0200
@@ -1,24 +1,12 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
-
-SUBDIRS = 
+PLUGIN = neon$(PLUGIN_SUFFIX)
+plugindir = audacious/$(TRANSPORT_PLUGIN_DIR)
 
-OBJECTIVE_LIBS = libneonsrc$(SHARED_SUFFIX)
-
-LIBDIR = $(plugindir)/$(TRANSPORT_PLUGIN_DIR)
-
-LIBADD += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(NEON_LIBS)
+SRCS = neon.c rb.c
 
-SOURCES = neon.c rb.c
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(BEEP_DEFINES) $(NEON_CFLAGS) -I../../intl -I../..
+include ../../buildsys.mk
+include ../../extra.mk
 
-#CFLAGS += -Wpointer-arith -Wimplicit -Wnested-externs -Wcast-align \
-#-Wcast-qual -Wstrict-prototypes -Wmissing-prototypes \
-#-Wmissing-declarations -W -Wno-unused -Wshadow -Wmissing-noreturn \
-#-Wundef -Wpacked -Wnested-externs -Wbad-function-cast -Wredundant-decls \
-#-Wfloat-equal -Wdisabled-optimization -pedantic -std=c99
-
-OBJECTS = ${SOURCES:.c=.o}
-
-include ../../mk/objective.mk
+CFLAGS += $(PLUGIN_CFLAGS)
+CPPFLAGS += $(PLUGIN_CPPFLAGS) $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) \
+	$(NEON_CFLAGS) -I../../intl -I../.. -Wall
+LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(XML_LIBS) $(NEON_LIBS)
diff -r e3de567a0146 -r 77a717cd7d1a src/pulse_audio/Makefile
--- a/src/pulse_audio/Makefile	Mon Sep 24 21:25:03 2007 +0200
+++ b/src/pulse_audio/Makefile	Mon Sep 24 21:25:20 2007 +0200
@@ -1,15 +1,11 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
+PLUGIN = pulse_audio${PLUGIN_SUFFIX}
+SRCS = pulse_audio.c
 
-OBJECTIVE_LIBS = libpulse_audio$(SHARED_SUFFIX)
-
-LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
+plugindir = audacious/${OUTPUT_PLUGIN_DIR}
 
-LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) -lpulse
-SOURCES = pulse_audio.c
+include ../../buildsys.mk
+include ../../extra.mk
 
-OBJECTS = ${SOURCES:.c=.o}
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../..
-
-include ../../mk/objective.mk
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
+CFLAGS += ${PLUGIN_CFLAGS}
+LIBS += -lpulse ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}