Mercurial > audlegacy-plugins

changeset 1862:d9d4b258fbf1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Millions of Makefile fixes. More to follow.
author Jonathan Schleifer <js@h3c.de>
date Mon, 24 Sep 2007 23:03:25 +0200
parents cbcb6d2154bd
children 0e92506c1805
files Makefile src/Makefile src/OSS/Makefile src/alac/Makefile src/alarm/Makefile src/alsa/Makefile src/aosd/Makefile src/audiocompress/Makefile src/blur_scope/Makefile src/cdaudio-ng/Makefile src/console/Makefile src/cue/Makefile src/curl/Makefile src/echo_plugin/Makefile src/esd/Makefile
diffstat 15 files changed, 155 insertions(+), 158 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Mon Sep 24 22:35:27 2007 +0200
+++ b/Makefile	Mon Sep 24 23:03:25 2007 +0200
@@ -1,3 +1,3 @@
-include buildsys.mk
+SUBDIRS = src po
 
-SUBDIRS = src po
+include buildsys.mk
--- a/src/Makefile	Mon Sep 24 22:35:27 2007 +0200
+++ b/src/Makefile	Mon Sep 24 23:03:25 2007 +0200
@@ -1,10 +1,11 @@
 include ../extra.mk
-include ../buildsys.mk
 
-SUBDIRS = $(INPUT_PLUGINS) \
-	$(OUTPUT_PLUGINS) \
-	$(EFFECT_PLUGINS) \
-	$(VISUALIZATION_PLUGINS) \
-	$(GENERAL_PLUGINS) \
-	$(CONTAINER_PLUGINS) \
-	$(TRANSPORT_PLUGINS)
+SUBDIRS = ${INPUT_PLUGINS}		\
+	  ${OUTPUT_PLUGINS}		\
+	  ${EFFECT_PLUGINS}		\
+	  ${VISUALIZATION_PLUGINS}	\
+	  ${GENERAL_PLUGINS}		\
+	  ${CONTAINER_PLUGINS}		\
+	  ${TRANSPORT_PLUGINS}
+
+include ../buildsys.mk
--- a/src/OSS/Makefile	Mon Sep 24 22:35:27 2007 +0200
+++ b/src/OSS/Makefile	Mon Sep 24 23:03:25 2007 +0200
@@ -1,13 +1,17 @@
+PLUGIN = OSS${PLUGIN_SUFFIX}
+plugindir = audacious/${OUTPUT_PLUGIN_DIR}
+
+SRCS = OSS.c		\
+       mixer.c		\
+       about.c		\
+       configure.c	\
+       audio.c		\
+       init.c		\
+       convert.c
+
+include ../../buildsys.mk
 include ../../extra.mk
 
-PLUGIN = OSS$(SHARED_SUFFIX)
-plugindir = audacious/$(OUTPUT_PLUGIN_DIR)
-
-SRCS = OSS.c mixer.c about.c configure.c audio.c init.c convert.c
-
-include ../../buildsys.mk
-
-LIBS += $(OSS_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
-CFLAGS += $(PLUGIN_CFLAGS)
-CPPFLAGS += $(PLUGIN_CPPFLAGS) $(MOWGLI_CFLAGS) $(OSS_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../.. -I.
-
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${OSS_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../.. -I.
+CFLAGS += ${PLUGIN_CFLAGS}
+LIBS += ${OSS_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
--- a/src/alac/Makefile	Mon Sep 24 22:35:27 2007 +0200
+++ b/src/alac/Makefile	Mon Sep 24 23:03:25 2007 +0200
@@ -1,12 +1,11 @@
+PLUGIN = alac${PLUGIN_SUFFIX}
+SRCS = alac.c demux.c plugin.c stream.c
+
+plugindir = audacious/${INPUT_PLUGIN_DIR}
+
+include ../../buildsys.mk
 include ../../extra.mk
 
-PLUGIN = alac$(SHARED_SUFFIX)
-plugindir = audacious/$(INPUT_PLUGIN_DIR)
-
-SRCS = alac.c demux.c plugin.c stream.c
-
-include ../../buildsys.mk
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../.. -Wall
-CPPFLAGS = $(CFLAGS)
-LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
+CPPFLAGS += ${PLUGIN_CFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../..
+CFLAGS += ${PLUGIN_CFLAGS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
--- a/src/alarm/Makefile	Mon Sep 24 22:35:27 2007 +0200
+++ b/src/alarm/Makefile	Mon Sep 24 23:03:25 2007 +0200
@@ -8,4 +8,4 @@
 
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
-LIBADD = ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
--- a/src/alsa/Makefile	Mon Sep 24 22:35:27 2007 +0200
+++ b/src/alsa/Makefile	Mon Sep 24 23:03:25 2007 +0200
@@ -1,14 +1,11 @@
-include ../../extra.mk
-
-PLUGIN = ALSA$(SHARED_SUFFIX)
-plugindir = audacious/$(OUTPUT_PLUGIN_DIR)
-
+PLUGIN = ALSA${SHARED_SUFFIX}
 SRCS = alsa.c about.c audio.c configure.c init.c
 
-include ../../buildsys.mk
+plugindir = audacious/${OUTPUT_PLUGIN_DIR}
 
-CFLAGS += $(PLUGIN_CFLAGS)
-CPPFLAGS += $(PLUGIN_CPPFLAGS) $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ALSA_CFLAGS) \
-	-I../../intl -I../..
-LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(ALSA_LIBS)
+include ../../buildsys.mk
+include ../../extra.mk
 
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ALSA_CFLAGS} -I../../intl -I../..
+CFLAGS += ${PLUGIN_CFLAGS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${ALSA_LIBS}
--- a/src/aosd/Makefile	Mon Sep 24 22:35:27 2007 +0200
+++ b/src/aosd/Makefile	Mon Sep 24 23:03:25 2007 +0200
@@ -1,15 +1,18 @@
+PLUGIN = aosd${PLUGIN_SUFFIX}
+SRCS = aosd.c		\
+       aosd_osd.c	\
+       aosd_style.c	\
+       aosd_trigger.c	\
+       aosd_ui.c	\
+       aosd_cfg.c	\
+       ghosd.c		\
+       ghosd-main.c
+
+plugindir = audacious/${GENERAL_PLUGIN_DIR}
+
+include ../../buildsys.mk
 include ../../extra.mk
 
-PLUGIN = aosd$(PLUGIN_SUFFIX)
-plugindir = audacious/$(GENERAL_PLUGIN_DIR)
-
-noinst_HEADERS = aosd.h aosd_osd.h aosd_style.h aosd_style_private.h aosd_trigger.h aosd_trigger_private.h aosd_ui.h aosd_cfg.h aosd_common.h ghosd.h ghosd-internal.h
-
-SRCS = aosd.c aosd_osd.c aosd_style.c aosd_trigger.c aosd_ui.c aosd_cfg.c ghosd.c ghosd-main.c
-
-include ../../buildsys.mk
-
-LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(CAIRO_LIBS) $(PANGOCAIRO_LIBS) $(XRENDER_LIBS) $(XCOMPOSITE_LIBS)
-CFLAGS += $(PLUGIN_CFLAGS)
-CPPFLAGS += $(PLUGIN_CPPFLAGS) $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(CAIRO_CFLAGS) $(PANGOCAIRO_CFLAGS) \
-	$(XRENDER_CFLAGS) $(XCOMPOSITE_CFLAGS) -I../../intl -I../.. -I..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${CAIRO_CFLAGS} ${PANGOCAIRO_CFLAGS} ${XRENDER_CFLAGS} ${XCOMPOSITE_CFLAGS} -I../../intl -I../.. -I..
+CFLAGS += ${PLUGIN_CFLAGS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${CAIRO_LIBS} ${PANGOCAIRO_LIBS} ${XRENDER_LIBS} ${XCOMPOSITE_LIBS}
--- a/src/audiocompress/Makefile	Mon Sep 24 22:35:27 2007 +0200
+++ b/src/audiocompress/Makefile	Mon Sep 24 23:03:25 2007 +0200
@@ -9,4 +9,4 @@
 
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
-LIBADD = ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
--- a/src/blur_scope/Makefile	Mon Sep 24 22:35:27 2007 +0200
+++ b/src/blur_scope/Makefile	Mon Sep 24 23:03:25 2007 +0200
@@ -8,4 +8,4 @@
 
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
-LIBADD = ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
--- a/src/cdaudio-ng/Makefile	Mon Sep 24 22:35:27 2007 +0200
+++ b/src/cdaudio-ng/Makefile	Mon Sep 24 23:03:25 2007 +0200
@@ -1,13 +1,12 @@
+PLUGIN = cdaudio-ng${PLUGIN_SUFFIX}
+SRCS = cdaudio-ng.c	\
+       configure.c
+
+plugindir = audacious/${INPUT_PLUGIN_DIR}
+
+include ../../buildsys.mk
 include ../../extra.mk
 
-PLUGIN = cdaudio-ng$(PLUGIN_SUFFIX)
-plugindir = audacious/$(INPUT_PLUGIN_DIR)
-
-SRCS = cdaudio-ng.c configure.c
-
-include ../../buildsys.mk
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) -Wall
-CPPFLAGS = $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(CDIO_CFLAGS) $(CDDB_CFLAGS) -I../..
-LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(CDIO_LIBS) $(CDDB_LIBS)
-
+CPPFLAGS = ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${CDIO_CFLAGS} ${CDDB_CFLAGS} -I../.. ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES}
+CFLAGS += ${PLUGIN_CFLAGS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${CDIO_LIBS} ${CDDB_LIBS}
--- 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} 
--- a/src/cue/Makefile	Mon Sep 24 22:35:27 2007 +0200
+++ b/src/cue/Makefile	Mon Sep 24 23:03:25 2007 +0200
@@ -1,12 +1,11 @@
+PLUGIN = cuesheet${PLUGIN_SUFFIX}
+SRCS = cuesheet.c
+
+plugindir = audacious/${INPUT_PLUGIN_DIR}
+
+include ../../buildsys.mk
 include ../../extra.mk
 
-PLUGIN = cuesheet$(SHARED_SUFFIX)
-plugindir = audacious/$(INPUT_PLUGIN_DIR)
-
-SRCS = cuesheet.c
-
-include ../../buildsys.mk
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../.. -Wall
-CPPFLAGS = $(CFLAGS)
-LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../..
+CFLAGS += ${PLUGIN_CFLAGS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${DBUS_LIB}
--- a/src/curl/Makefile	Mon Sep 24 22:35:27 2007 +0200
+++ b/src/curl/Makefile	Mon Sep 24 23:03:25 2007 +0200
@@ -1,12 +1,11 @@
-PLUGIN = curl$(PLUGIN_SUFFIX)
-plugindir = audacious/$(TRANSPORT_PLUGIN_DIR)
+PLUGIN = curl${PLUGIN_SUFFIX}
+SRCS = curl.c
 
-SRCS = curl.c
+plugindir = audacious/${TRANSPORT_PLUGIN_DIR}
 
 include ../../buildsys.mk
 include ../../extra.mk
 
-CFLAGS += $(PLUGIN_CFLAGS)
-CPPFLAGS += $(PLUGIN_CPPFLAGS) $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) \
-	$(CURL_CFLAGS) -I../../intl -I../.. -Wall
-LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(XML_LIBS) $(CURL_LIBS)
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} ${CURL_CFLAGS} -I../../intl -I../..
+CFLAGS += ${PLUGIN_CFLAGS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${XML_LIBS} ${CURL_LIBS}
--- a/src/echo_plugin/Makefile	Mon Sep 24 22:35:27 2007 +0200
+++ b/src/echo_plugin/Makefile	Mon Sep 24 23:03:25 2007 +0200
@@ -1,5 +1,6 @@
 PLUGIN = echo${PLUGIN_SUFFIX}
-SRCS = echo.c gui.c
+SRCS = echo.c	\
+       gui.c
 
 plugindir = audacious/${EFFECT_PLUGIN_DIR}
 
@@ -8,4 +9,4 @@
 
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
-LIBADD = ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
--- a/src/esd/Makefile	Mon Sep 24 22:35:27 2007 +0200
+++ b/src/esd/Makefile	Mon Sep 24 23:03:25 2007 +0200
@@ -1,15 +1,13 @@
-include ../../extra.mk
+PLUGIN = ESD${PLUGIN_SUFFIX}
+SRCS = esd.c mixer.c about.c configure.c audio.c init.c
 
-PLUGIN = ESD$(PLUGIN_SUFFIX)
-plugindir = audacious/$(OUTPUT_PLUGIN_DIR)
+plugindir = audacious/${OUTPUT_PLUGIN_DIR}
 
-SRCS = esd.c mixer.c about.c configure.c audio.c init.c
 
 include ../../buildsys.mk
+include ../../extra.mk
 
-LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(ESD_LIBS) $(OSS_LIBS)
 
-CFLAGS += $(PLUGIN_CFLAGS)
-CPPFLAGS += $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ESD_CFLAGS) \
-	-I../../intl -I../.. -I..
-
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ESD_CFLAGS} -I../../intl -I../.. -I..
+CFLAGS += ${PLUGIN_CFLAGS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${ESD_LIBS} ${OSS_LIBS}