# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1190650394 18000
# Node ID c3fdb0e5a3068145122df6a6a269c50103848d12
# Parent  1b521a30820be11cf817eb3a2076b7c4730437af
Convert some makefiles, remove some -DHAVE_CONFIG_H.

diff -r 1b521a30820b -r c3fdb0e5a306 extra.mk.in
--- a/extra.mk.in	Mon Sep 24 10:49:57 2007 -0500
+++ b/extra.mk.in	Mon Sep 24 11:13:14 2007 -0500
@@ -374,3 +374,5 @@
 TRANSPORT_PLUGINS ?= @TRANSPORT_PLUGINS@
 LIBFLAC_LIBS ?= @LIBFLAC_LIBS@
 LIBFLAC_CFLAGS ?= @LIBFLAC_CFLAGS@
+MOWGLI_CFLAGS ?= @MOWGLI_CFLAGS@
+MOWGLI_LIBS ?= @MOWGLI_LIBS@
diff -r 1b521a30820b -r c3fdb0e5a306 src/console/Audacious_Config.cxx
--- a/src/console/Audacious_Config.cxx	Mon Sep 24 10:49:57 2007 -0500
+++ b/src/console/Audacious_Config.cxx	Mon Sep 24 11:13:14 2007 -0500
@@ -8,9 +8,7 @@
  * Libconsole preferences GUI by Giacomo Lozito
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <glib.h>
 #include <audacious/i18n.h>
diff -r 1b521a30820b -r c3fdb0e5a306 src/console/Audacious_Driver.cxx
--- a/src/console/Audacious_Driver.cxx	Mon Sep 24 10:49:57 2007 -0500
+++ b/src/console/Audacious_Driver.cxx	Mon Sep 24 11:13:14 2007 -0500
@@ -6,9 +6,7 @@
  * http://www.slack.net/~ant/libs/
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <glib.h>
 #include <audacious/i18n.h>
diff -r 1b521a30820b -r c3fdb0e5a306 src/console/Makefile
--- a/src/console/Makefile	Mon Sep 24 10:49:57 2007 -0500
+++ b/src/console/Makefile	Mon Sep 24 11:13:14 2007 -0500
@@ -1,11 +1,10 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
+include ../../extra.mk
+
+PLUGIN = console$(PLUGIN_SUFFIX)
 
-OBJECTIVE_LIBS = libconsole$(SHARED_SUFFIX)
+plugindir = audacious/$(INPUT_PLUGIN_DIR)
 
-LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
-
-SOURCES = \
+SRCS = \
 	Audacious_Config.cxx    \
 	Audacious_Driver.cxx    \
 	Ay_Apu.cxx              \
@@ -57,10 +56,9 @@
 	Ym2612_Emu.cxx          \
 	Zlib_Inflater.cxx
 
-OBJECTS = ${SOURCES:.cxx=.o}
+include ../../buildsys.mk
 
-LIBADD += -lz $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) -lstdc++
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
-CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
-
-include ../../mk/objective.mk
+LIBS += -lz $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) -lstdc++
+CFLAGS += $(PLUGIN_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
+CXXFLAGS += $(PLUGIN_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
+CPPFLAGS += $(CXXFLAGS)
diff -r 1b521a30820b -r c3fdb0e5a306 src/sexypsf/Makefile
--- a/src/sexypsf/Makefile	Mon Sep 24 10:49:57 2007 -0500
+++ b/src/sexypsf/Makefile	Mon Sep 24 11:13:14 2007 -0500
@@ -1,12 +1,9 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
-
-OBJECTIVE_LIBS = libsexypsf$(SHARED_SUFFIX)
+include ../../extra.mk
 
-LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
-LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
+PLUGIN = sexypsf$(PLUGIN_SUFFIX)
+plugindir = audacious/$(INPUT_PLUGIN_DIR)
 
-SOURCES = \
+SRCS = \
 	PsxBios.c \
 	PsxCounters.c \
 	PsxDma.c \
@@ -20,13 +17,12 @@
 	spu/spu.c \
 	plugin.c
 
-LIBADD = -lz
-
-OBJECTS = ${SOURCES:.c=.o}
+LIBS += -lz $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../.. -Ispu/ -I.
+include ../../buildsys.mk
 
-include ../../mk/objective.mk
+CPPFLAGS += $(MOWGLI_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../.. -Ispu/ -I.
+CFLAGS += $(PLUGIN_CFLAGS)
 
 clean-posthook:
 	@rm -f spu/*.o
diff -r 1b521a30820b -r c3fdb0e5a306 src/tonegen/Makefile
--- a/src/tonegen/Makefile	Mon Sep 24 10:49:57 2007 -0500
+++ b/src/tonegen/Makefile	Mon Sep 24 11:13:14 2007 -0500
@@ -1,15 +1,13 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
+include ../../extra.mk
 
-OBJECTIVE_LIBS = libtonegen$(SHARED_SUFFIX)
+PLUGIN = tonegen$(PLUGIN_SUFFIX)
+plugindir = audacious/$(INPUT_PLUGIN_DIR)
 
-LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
-LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
+SRCS = tonegen.c
 
-SOURCES = tonegen.c
-
-OBJECTS = ${SOURCES:.c=.o}
+include ../../buildsys.mk
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../..
+LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 
-include ../../mk/objective.mk
+CFLAGS += $(PLUGIN_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../..
+CPPFLAGS = $(CFLAGS)