# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1190656853 18000
# Node ID 3e2480ad8cfc8efc21ed3a1370e8cef89c9d17c8
# Parent  f1b594fa80ceb450905ad4ed0c483b5070606a67# Parent  7de4914cd8c84cfc6bbafaf9fc1764fa52aa538f
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins

diff -r f1b594fa80ce -r 3e2480ad8cfc src/audiocompress/Makefile
--- a/src/audiocompress/Makefile	Mon Sep 24 13:00:11 2007 -0500
+++ b/src/audiocompress/Makefile	Mon Sep 24 13:00:53 2007 -0500
@@ -1,13 +1,12 @@
+PLUGIN = audiocompress${PLUGIN_SUFFIX}
+SRCS = compress.c	\
+       audacious-glue.c
+
+plugindir = audacious/${EFFECT_PLUGIN_DIR}
+
+include ../../buildsys.mk
 include ../../extra.mk
 
-PLUGIN = audiocompress$(SHARED_SUFFIX)
-plugindir = audacious/$(EFFECT_PLUGIN_DIR)
-
-SRCS = compress.c audacious-glue.c
-
-include ../../buildsys.mk
-
-CFLAGS += $(PLUGIN_CFLAGS)
-CPPFLAGS += $(PLUGIN_CPPFLAGS) $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../..
-LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
-
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
+CFLAGS += ${PLUGIN_CFLAGS}
+LIBADD = ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r f1b594fa80ce -r 3e2480ad8cfc src/audiocompress/audacious-glue.c
--- a/src/audiocompress/audacious-glue.c	Mon Sep 24 13:00:11 2007 -0500
+++ b/src/audiocompress/audacious-glue.c	Mon Sep 24 13:00:53 2007 -0500
@@ -2,7 +2,7 @@
 ** Audacious effect plugin for AudioCompress
 */
 
-#include "../../config.h"
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff -r f1b594fa80ce -r 3e2480ad8cfc src/madplug/Makefile
--- a/src/madplug/Makefile	Mon Sep 24 13:00:11 2007 -0500
+++ b/src/madplug/Makefile	Mon Sep 24 13:00:53 2007 -0500
@@ -1,20 +1,18 @@
+PLUGIN = madplug${PLUGIN_SUFFIX}
+SRCS = configure.c	\
+       dither.c		\
+       input.c		\
+       replaygain.c	\
+       decoder.c	\
+       fileinfo.c	\
+       plugin.c		\
+       xing.c
+
+plugindir = audacious/${INPUT_PLUGIN_DIR}
+
+include ../../buildsys.mk
 include ../../extra.mk
 
-PLUGIN = madplug$(PLUGIN_SUFFIX)
-plugindir = audacious/$(INPUT_PLUGIN_DIR)
-
-SRCS = \
-  configure.c \
-  dither.c \
-  input.c \
-  replaygain.c \
-  decoder.c \
-  fileinfo.c \
-  plugin.c \
-  xing.c
-
-include ../../buildsys.mk
-
-CFLAGS   += $(PICFLAGS) $(SIMD_CFLAGS) -Wall
-CPPFLAGS += $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(MOWGLI_CFLAGS) $(ARCH_DEFINES) -I../..
-LIBS += -L/opt/local/lib -L$(libdir) -laudid3tag -lmad $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${MOWGLI_CFLAGS} ${ARCH_DEFINES} -I../..
+CFLAGS += ${PLUGIN_CFLAGS} ${SIMD_CFLAGS}
+LIBS += -L${libdir} -laudid3tag -lmad ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}