changeset 1847:67f2286e2f12

Automated merge with ssh://hg.atheme-project.org//hg/audacious-plugins

--- a/src/curl/Makefile	Mon Sep 24 21:15:00 2007 +0200
+++ b/src/curl/Makefile	Mon Sep 24 21:15:13 2007 +0200
@@ -1,24 +1,12 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
-
-SUBDIRS = 
+PLUGIN = curl$(PLUGIN_SUFFIX)
+plugindir = audacious/$(TRANSPORT_PLUGIN_DIR)
 
-OBJECTIVE_LIBS = libcurlsrc$(SHARED_SUFFIX)
-
-LIBDIR = $(plugindir)/$(TRANSPORT_PLUGIN_DIR)
-
-LIBADD += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(CURL_LIBS)
+SRCS = curl.c
 
-SOURCES = curl.c
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(BEEP_DEFINES) $(CURL_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) \
+	$(CURL_CFLAGS) -I../../intl -I../.. -Wall
+LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(XML_LIBS) $(CURL_LIBS)

--- a/src/curl/curl.c	Mon Sep 24 21:15:00 2007 +0200
+++ b/src/curl/curl.c	Mon Sep 24 21:15:13 2007 +0200
@@ -16,9 +16,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <audacious/vfs.h>
 #include <audacious/plugin.h>