# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1190650921 18000
# Node ID bbebc130f8f58e15d12e80bd7a8fb994f5cca32c
# Parent  7ce9a2e1637f47bab8eece649d42a372f0a59e4e
cue: Mk2, HAVE_CONFIG_H removal, etc

diff -r 7ce9a2e1637f -r bbebc130f8f5 src/cue/Makefile
--- a/src/cue/Makefile	Mon Sep 24 11:19:28 2007 -0500
+++ b/src/cue/Makefile	Mon Sep 24 11:22:01 2007 -0500
@@ -1,18 +1,12 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
-
-OBJECTIVE_LIBS = libcuesheet$(SHARED_SUFFIX)
+include ../../extra.mk
 
-LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
+PLUGIN = cuesheet$(SHARED_SUFFIX)
+plugindir = audacious/$(INPUT_PLUGIN_DIR)
 
-SOURCES = cuesheet.c
+SRCS = cuesheet.c
 
-OBJECTS = ${SOURCES:.c=.o}
+include ../../buildsys.mk
 
 CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../.. -Wall
-
-CXXFLAGS = $(CFLAGS)
-
-LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
-
-include ../../mk/objective.mk
+CPPFLAGS = $(CFLAGS)
+LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
diff -r 7ce9a2e1637f -r bbebc130f8f5 src/cue/cuesheet.c
--- a/src/cue/cuesheet.c	Mon Sep 24 11:19:28 2007 -0500
+++ b/src/cue/cuesheet.c	Mon Sep 24 11:22:01 2007 -0500
@@ -14,9 +14,8 @@
  * GNU General Public License. Please consult the file "COPYING" for
  * details.
  */
-#ifdef HAVE_CONFIG_H
+
 #include "config.h"
-#endif
 
 /* #define DEBUG 1 */
 
diff -r 7ce9a2e1637f -r bbebc130f8f5 src/wav/Makefile
--- a/src/wav/Makefile	Mon Sep 24 11:19:28 2007 -0500
+++ b/src/wav/Makefile	Mon Sep 24 11:22:01 2007 -0500
@@ -1,6 +1,6 @@
 include ../../extra.mk
 
-PLUGIN = libwav$(PLUGIN_SUFFIX)
+PLUGIN = wav$(PLUGIN_SUFFIX)
 plugindir = audacious/$(INPUT_PLUGIN_DIR)
 
 SRCS = wav$(WAV_SNDFILE).c