# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1190656073 18000
# Node ID a93462deb02664a5838c5d4cccc2c52ed55762ed
# Parent  cae98a7eef82e7442f0c9d5093b5b5efa7d41887# Parent  8fee3d70029a388e7f9e3c50c05fb4410aafd329
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins

diff -r cae98a7eef82 -r a93462deb026 src/wma/Makefile
--- a/src/wma/Makefile	Mon Sep 24 12:47:30 2007 -0500
+++ b/src/wma/Makefile	Mon Sep 24 12:47:53 2007 -0500
@@ -1,17 +1,32 @@
-include ../../extra.mk
+PLUGIN = wma$(PLUGIN_SUFFIX)
+SRCS = wma.c			\
+       libffwma/allcodecs.c	\
+       libffwma/allformats.c	\
+       libffwma/asf.c		\
+       libffwma/avio.c		\
+       libffwma/aviobuf.c	\
+       libffwma/common.c	\
+       libffwma/cutils.c	\
+       libffwma/dsputil.c	\
+       libffwma/fft.c		\
+       libffwma/file.c		\
+       libffwma/futils.c	\
+       libffwma/mdct.c		\
+       libffwma/os_support.c	\
+       libffwma/parser.c	\
+       libffwma/simple_idct.c	\
+       libffwma/utils.c		\
+       libffwma/wmadec.c	\
+       libffwma/mem.c		\
+       libffwma/uri.c
 
-PLUGIN = wma$(PLUGIN_SUFFIX)
 plugindir = audacious/$(INPUT_PLUGIN_DIR)
-SUBDIRS = libffwma
 
-LIBDEP = ./libffwma/libffwma.a
-
-SRCS = wma.c
-
+include ../../extra.mk
 include ../../buildsys.mk
 
-LIBS += ./libffwma/libffwma.a $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
+${LIB}: libffwma/${LIB_PREFIX}ffwma${LIB_SUFFIX}
 
-CFLAGS += $(PLUGIN_CFLAGS)
-CPPFLAGS += $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../.. -I./libffwma -std=c99 $(GCC42_CFLAGS)
-
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../.. -I./libffwma -std=c99 ${GCC42_CFLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+CFLAGS += ${PLUGIN_CFLAGS}
+LIBS += ./libffwma/libffwma.a ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r cae98a7eef82 -r a93462deb026 src/wma/libffwma/Makefile
--- a/src/wma/libffwma/Makefile	Mon Sep 24 12:47:30 2007 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-include ../../../extra.mk
-
-STATIC_LIB_NOINST = libffwma.a
-
-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 \
-		os_support.c \
-		parser.c simple_idct.c \
-		utils.c wmadec.c mem.c uri.c
-
-include ../../../buildsys.mk
-
-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../../..
-