# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1190653334 18000
# Node ID add71276abfc1271da6569e102c113ee221c1499
# Parent  95c7d02a2092eb11bfeb560247888f407356dbaf
wma: Mk2

diff -r 95c7d02a2092 -r add71276abfc src/wma/Makefile
--- a/src/wma/Makefile	Mon Sep 24 11:56:34 2007 -0500
+++ b/src/wma/Makefile	Mon Sep 24 12:02:14 2007 -0500
@@ -1,20 +1,17 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
-
-OBJECTIVE_LIBS = libwma$(SHARED_SUFFIX)
-
-SUBDIRS = libffwma
+include ../../extra.mk
 
-LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
-
-LIBADD = ./libffwma/libffwma.a $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
-
-SOURCES = wma.c
-
-OBJECTS = ${SOURCES:.c=.o}
+PLUGIN = wma$(PLUGIN_SUFFIX)
+plugindir = audacious/$(INPUT_PLUGIN_DIR)
+SUBDIRS = libffwma
 
 LIBDEP = ./libffwma/libffwma.a
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../.. -I./libffwma -std=c99 $(GCC42_CFLAGS)
+SRCS = wma.c
+
+include ../../buildsys.mk
 
-include ../../mk/objective.mk
+LIBS += ./libffwma/libffwma.a $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
+
+CFLAGS += $(PLUGIN_CFLAGS)
+CPPFLAGS += $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../.. -I./libffwma -std=c99 $(GCC42_CFLAGS)
+
diff -r 95c7d02a2092 -r add71276abfc src/wma/libffwma/Makefile
--- a/src/wma/libffwma/Makefile	Mon Sep 24 11:56:34 2007 -0500
+++ b/src/wma/libffwma/Makefile	Mon Sep 24 12:02:14 2007 -0500
@@ -1,9 +1,8 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+include ../../../extra.mk
 
-OBJECTIVE_LIBS_NOINST=	libffwma.a
+STATIC_LIB_NOINST = libffwma.a
 
-SOURCES=	allcodecs.c allformats.c \
+SRCS=	allcodecs.c allformats.c \
 		asf.c avio.c aviobuf.c \
 		common.c cutils.c dsputil.c \
 		fft.c file.c futils.c mdct.c \
@@ -11,8 +10,8 @@
 		parser.c simple_idct.c \
 		utils.c wmadec.c mem.c uri.c
 
-CFLAGS+=	$(PICFLAGS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -c -I../../..
+include ../../../buildsys.mk
 
-OBJECTS=${SOURCES:.c=.o}
+CFLAGS += $(PLUGIN_CFLAGS)
+CPPFLAGS += $(GTK_CFLAGS) $(GLIB_CFLAGS) $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(PANGO_CFLAGS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -I../../..
 
-include ../../../mk/objective.mk
diff -r 95c7d02a2092 -r add71276abfc src/wma/wma.c
--- a/src/wma/wma.c	Mon Sep 24 11:56:34 2007 -0500
+++ b/src/wma/wma.c	Mon Sep 24 12:02:14 2007 -0500
@@ -23,6 +23,9 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 #define _XOPEN_SOURCE 600
+
+#include "config.h"
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <math.h>