# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1190651615 18000
# Node ID 4a200593472de53fc10dadcc2b5db0fd00bd788c
# Parent  cd28934add646d6d278c53a6cff4fde4cf60e42d
vorbis: Mk2

diff -r cd28934add64 -r 4a200593472d src/vorbis/Makefile
--- a/src/vorbis/Makefile	Mon Sep 24 11:30:40 2007 -0500
+++ b/src/vorbis/Makefile	Mon Sep 24 11:33:35 2007 -0500
@@ -1,16 +1,12 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
+include ../../extra.mk
 
-OBJECTIVE_LIBS = libvorbisplugin$(SHARED_SUFFIX)
-
-LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
+PLUGIN = vorbis$(PLUGIN_SUFFIX)
+plugindir = audacious/$(INPUT_PLUGIN_DIR)
 
-SOURCES = configure.c  fileinfo.c  vcedit.c  vorbis.c
+SRCS = configure.c  fileinfo.c  vcedit.c  vorbis.c
 
-OBJECTS = ${SOURCES:.c=.o}
+include ../../buildsys.mk
 
-LIBADD = $(OGG_VORBIS_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../..
-
-include ../../mk/objective.mk
+LIBS += $(OGG_VORBIS_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
+CFLAGS += $(PLUGIN_CFLAGS)
+CPPFLAGS += $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(OGG_VORBIS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../..
diff -r cd28934add64 -r 4a200593472d src/vorbis/configure.c
--- a/src/vorbis/configure.c	Mon Sep 24 11:30:40 2007 -0500
+++ b/src/vorbis/configure.c	Mon Sep 24 11:33:35 2007 -0500
@@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
+#include "config.h"
 
 #include "vorbis.h"
 
diff -r cd28934add64 -r 4a200593472d src/vorbis/fileinfo.c
--- a/src/vorbis/fileinfo.c	Mon Sep 24 11:30:40 2007 -0500
+++ b/src/vorbis/fileinfo.c	Mon Sep 24 11:33:35 2007 -0500
@@ -21,9 +21,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
+#include "config.h"
 
 #include <glib.h>
 #include <gtk/gtk.h>
diff -r cd28934add64 -r 4a200593472d src/vorbis/vorbis.c
--- a/src/vorbis/vorbis.c	Mon Sep 24 11:30:40 2007 -0500
+++ b/src/vorbis/vorbis.c	Mon Sep 24 11:33:35 2007 -0500
@@ -31,9 +31,7 @@
  * thread-safe.
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
+#include "config.h"
 
 #define DEBUG