diff src/console/Makefile @ 1862:d9d4b258fbf1

Millions of Makefile fixes. More to follow.

--- a/src/console/Makefile	Mon Sep 24 22:35:27 2007 +0200
+++ b/src/console/Makefile	Mon Sep 24 23:03:25 2007 +0200
@@ -1,64 +1,61 @@
+PLUGIN = console${PLUGIN_SUFFIX}
+SRCS = Audacious_Config.cxx    \
+       Audacious_Driver.cxx    \
+       Ay_Apu.cxx              \
+       Ay_Cpu.cxx              \
+       Ay_Emu.cxx              \
+       Blip_Buffer.cxx         \
+       Classic_Emu.cxx         \
+       Data_Reader.cxx         \
+       Dual_Resampler.cxx      \
+       Effects_Buffer.cxx      \
+       Fir_Resampler.cxx       \
+       Gbs_Emu.cxx             \
+       Gb_Apu.cxx              \
+       Gb_Cpu.cxx              \
+       Gb_Oscs.cxx             \
+       gme.cxx                 \
+       Gme_File.cxx            \
+       Gym_Emu.cxx             \
+       Gzip_Reader.cxx         \
+       Hes_Apu.cxx             \
+       Hes_Cpu.cxx             \
+       Hes_Emu.cxx             \
+       Kss_Cpu.cxx             \
+       Kss_Emu.cxx             \
+       Kss_Scc_Apu.cxx         \
+       M3u_Playlist.cxx        \
+       Multi_Buffer.cxx        \
+       Music_Emu.cxx           \
+       Nes_Apu.cxx             \
+       Nes_Cpu.cxx             \
+       Nes_Fme7_Apu.cxx        \
+       Nes_Namco_Apu.cxx       \
+       Nes_Oscs.cxx            \
+       Nes_Vrc6_Apu.cxx        \
+       Nsfe_Emu.cxx            \
+       Nsf_Emu.cxx             \
+       Sap_Apu.cxx             \
+       Sap_Cpu.cxx             \
+       Sap_Emu.cxx             \
+       Sms_Apu.cxx             \
+       Snes_Spc.cxx            \
+       Spc_Cpu.cxx             \
+       Spc_Dsp.cxx             \
+       Spc_Emu.cxx             \
+       Vfs_File.cxx            \
+       Vgm_Emu.cxx             \
+       Vgm_Emu_Impl.cxx        \
+       Ym2413_Emu.cxx          \
+       Ym2612_Emu.cxx          \
+       Zlib_Inflater.cxx
+
+plugindir = audacious/${INPUT_PLUGIN_DIR}
+
+include ../../buildsys.mk
 include ../../extra.mk
 
-PLUGIN = console$(PLUGIN_SUFFIX)
-
-plugindir = audacious/$(INPUT_PLUGIN_DIR)
-
-SRCS = \
-	Audacious_Config.cxx    \
-	Audacious_Driver.cxx    \
-	Ay_Apu.cxx              \
-	Ay_Cpu.cxx              \
-	Ay_Emu.cxx              \
-	Blip_Buffer.cxx         \
-	Classic_Emu.cxx         \
-	Data_Reader.cxx         \
-	Dual_Resampler.cxx      \
-	Effects_Buffer.cxx      \
-	Fir_Resampler.cxx       \
-	Gbs_Emu.cxx             \
-	Gb_Apu.cxx              \
-	Gb_Cpu.cxx              \
-	Gb_Oscs.cxx             \
-	gme.cxx                 \
-	Gme_File.cxx            \
-	Gym_Emu.cxx             \
-	Gzip_Reader.cxx         \
-	Hes_Apu.cxx             \
-	Hes_Cpu.cxx             \
-	Hes_Emu.cxx             \
-	Kss_Cpu.cxx             \
-	Kss_Emu.cxx             \
-	Kss_Scc_Apu.cxx         \
-	M3u_Playlist.cxx        \
-	Multi_Buffer.cxx        \
-	Music_Emu.cxx           \
-	Nes_Apu.cxx             \
-	Nes_Cpu.cxx             \
-	Nes_Fme7_Apu.cxx        \
-	Nes_Namco_Apu.cxx       \
-	Nes_Oscs.cxx            \
-	Nes_Vrc6_Apu.cxx        \
-	Nsfe_Emu.cxx            \
-	Nsf_Emu.cxx             \
-	Sap_Apu.cxx             \
-	Sap_Cpu.cxx             \
-	Sap_Emu.cxx             \
-	Sms_Apu.cxx             \
-	Snes_Spc.cxx            \
-	Spc_Cpu.cxx             \
-	Spc_Dsp.cxx             \
-	Spc_Emu.cxx             \
-	Vfs_File.cxx            \
-	Vgm_Emu.cxx             \
-	Vgm_Emu_Impl.cxx        \
-	Ym2413_Emu.cxx          \
-	Ym2612_Emu.cxx          \
-	Zlib_Inflater.cxx
-
-include ../../buildsys.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)
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${DBUS_CFLAGS} -I../../intl -I../..
+CFLAGS += ${PLUGIN_CFLAGS}
+CXXFLAGS += ${PLUGIN_CFLAGS}
+LIBS += -lz ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}$ ${DBUS_LIB}