# HG changeset patch
# User nenolod
# Date 1158575924 25200
# Node ID cf1054422f810bbef79d62fb90cee2a2483fddca
# Parent  ada5b8bf14719cc6f2cbcc101780c7bc24195aec
[svn] - fix a lot of paths
- reduce more makefiles

diff -r ada5b8bf1471 -r cf1054422f81 ChangeLog
--- a/ChangeLog	Mon Sep 18 03:34:48 2006 -0700
+++ b/ChangeLog	Mon Sep 18 03:38:44 2006 -0700
@@ -1,3 +1,17 @@
+2006-09-18 10:34:48 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [32]
+  - and some more of that wonderful Makefile.in -> Makefile reduction
+  
+
+  Changes:        Modified:
+  +16 -5          trunk/configure.ac  
+  +16 -16         trunk/src/audiocompress/Makefile.in  
+  +42 -16         trunk/src/ladspa/Makefile.in  
+  +16 -42         trunk/src/sid/Makefile.in  
+  +16 -16         trunk/src/stereo_plugin/Makefile.in  
+  +0 -16          trunk/src/voice_removal/Makefile.in  
+
+
 2006-09-18 10:31:09 +0000  William Pitcock <nenolod@nenolod.net>
   revision [30]
   - more Makefile reduction
diff -r ada5b8bf1471 -r cf1054422f81 configure.ac
--- a/configure.ac	Mon Sep 18 03:34:48 2006 -0700
+++ b/configure.ac	Mon Sep 18 03:38:44 2006 -0700
@@ -1053,33 +1053,16 @@
 AC_SUBST(CONTAINER_PLUGINS)
 
 AC_CONFIG_FILES([
-	src/OSS/Makefile
-	src/esd/Makefile
-	src/alsa/Makefile
-	src/jack/Makefile
-	src/arts/Makefile
 	src/arts/arts_helper/Makefile
-	src/disk_writer/Makefile
-	src/pulse_audio/Makefile
-	src/sun/Makefile
-	src/modplug/Makefile
 	src/modplug/archive/Makefile
 	src/modplug/gui/Makefile
-	src/flac/Makefile
 	src/flac/plugin_common/Makefile
-	src/timidity/Makefile
 	src/timidity/libtimidity/Makefile
 	src/timidity/src/Makefile
-	src/amidi-plug/Makefile
 	src/amidi-plug/pcfg/Makefile
 	src/amidi-plug/backend-alsa/Makefile
 	src/amidi-plug/backend-fluidsynth/Makefile
 	src/amidi-plug/backend-dummy/Makefile
-	src/blur_scope/Makefile
-	src/rocklight/Makefile
-	src/song_change/Makefile
-	src/lirc/Makefile
-	src/scrobbler/Makefile
 	mk/rules.mk
 ])
 
diff -r ada5b8bf1471 -r cf1054422f81 src/CoreAudio/Makefile
--- a/src/CoreAudio/Makefile	Mon Sep 18 03:34:48 2006 -0700
+++ b/src/CoreAudio/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -1,5 +1,5 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+include ../..les.mk
+include ../..it.mk
 
 OBJECTIVE_LIBS = libcoreaudio$(SHARED_SUFFIX)
 
@@ -12,6 +12,6 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../..tl -I../..
 
-include ../../../mk/objective.mk
+include ../..jective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/OSS/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/OSS/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -0,0 +1,17 @@
+include ../../mk/rules.mk
+include ../../mk/init.mk
+
+OBJECTIVE_LIBS = libOSS$(SHARED_SUFFIX)
+
+noinst_HEADERS = OSS.h soundcard.h
+
+LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
+
+LIBADD = $(OSS_LIBS) $(GTK_LIBS)
+SOURCES = OSS.c mixer.c about.c configure.c audio.c init.c convert.c
+
+OBJECTS = ${SOURCES:.c=.o}
+
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../..
+
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/OSS/Makefile.in
--- a/src/OSS/Makefile.in	Mon Sep 18 03:34:48 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
-
-OBJECTIVE_LIBS = libOSS$(SHARED_SUFFIX)
-
-noinst_HEADERS = OSS.h soundcard.h
-
-LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
-
-LIBADD = $(OSS_LIBS) $(GTK_LIBS)
-SOURCES = OSS.c mixer.c about.c configure.c audio.c init.c convert.c
-
-OBJECTS = ${SOURCES:.c=.o}
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../..
-
-include ../../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/aac/Makefile
--- a/src/aac/Makefile	Mon Sep 18 03:34:48 2006 -0700
+++ b/src/aac/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -1,6 +1,6 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+include ../../mk/rules.mk
+include ../../mk/init.mk
 
 SUBDIRS = mp4ff libfaad2 src
 
-include ../../../mk/objective.mk
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/adplug/Makefile
--- a/src/adplug/Makefile	Mon Sep 18 03:34:48 2006 -0700
+++ b/src/adplug/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -1,5 +1,5 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+include ../../mk/rules.mk
+include ../../mk/init.mk
 
 SUBDIRS = core
 OBJECTIVE_LIBS = libadplug$(SHARED_SUFFIX)
@@ -13,8 +13,8 @@
 OBJECTS = ${SOURCES:.cc=.o}
 
 CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(BINIO_CFLAGS) \
-	-I../../../intl -I../../.. -I./core
+	-I../../intl -I../.. -I./core
 CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(BINIO_CFLAGS) \
-	-I../../../intl -I../../.. -I./core
+	-I../../intl -I../.. -I./core
 
-include ../../../mk/objective.mk
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/alsa/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/alsa/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -0,0 +1,18 @@
+include ../../mk/rules.mk
+include ../../mk/init.mk
+
+OBJECTIVE_LIBS = libALSA$(SHARED_SUFFIX)
+
+noinst_HEADERS = alsa.h
+
+LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
+
+LIBADD = $(GTK_LIBS) $(ALSA_LIBS) -lpthread
+SOURCES = alsa.c about.c audio.c configure.c init.c
+
+OBJECTS = ${SOURCES:.c=.o}
+
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ALSA_CFLAGS) \
+	-I../../intl -I../..
+
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/alsa/Makefile.in
--- a/src/alsa/Makefile.in	Mon Sep 18 03:34:48 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
-
-OBJECTIVE_LIBS = libALSA$(SHARED_SUFFIX)
-
-noinst_HEADERS = alsa.h
-
-LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
-
-LIBADD = $(GTK_LIBS) $(ALSA_LIBS) -lpthread
-SOURCES = alsa.c about.c audio.c configure.c init.c
-
-OBJECTS = ${SOURCES:.c=.o}
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ALSA_CFLAGS) \
-	-I../../../intl -I../../..
-
-include ../../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/amidi-plug/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/amidi-plug/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -0,0 +1,28 @@
+include ../../mk/rules.mk
+include ../../mk/init.mk
+
+OBJECTIVE_LIBS = libamidi-plug$(SHARED_SUFFIX)
+SUBDIRS = pcfg 
+
+noinst_HEADERS = amidi-plug.h i_backend.h i_midi.h i_midievent.h \
+                 i_configure.h i_configure_private.h \
+                 i_configure-ap.h i_configure-alsa.h \
+                 i_configure-fluidsynth.h i_configure-dummy.h \
+                 i_fileinfo.h i_utils.h i_common.h \
+                 amidi-plug-icon.xpm amidi-plug.logo.xpm \
+                 amidi-plug.midiicon.xpm
+
+LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
+
+LIBADD = $(GTK_LIBS) $(GMODULE_LIBS) -lpthread ./pcfg/libpcfg.a
+SOURCES = amidi-plug.c i_midi.c i_backend.c \
+          i_configure.c i_configure-ap.c i_configure-alsa.c \
+          i_configure-fluidsynth.c i_configure-dummy.c \
+          i_utils.c i_fileinfo.c
+
+OBJECTS = ${SOURCES:.c=.o}
+
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GMODULE_CFLAGS) -DAMIDIPLUGBACKENDDIR=\"$(AMIDIPLUGBACKENDDIR)\" \
+          -I../../intl -I../..
+
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/amidi-plug/Makefile.in
--- a/src/amidi-plug/Makefile.in	Mon Sep 18 03:34:48 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
-
-OBJECTIVE_LIBS = libamidi-plug$(SHARED_SUFFIX)
-SUBDIRS = pcfg @AMIDIPLUG_BACKENDS@
-
-noinst_HEADERS = amidi-plug.h i_backend.h i_midi.h i_midievent.h \
-                 i_configure.h i_configure_private.h \
-                 i_configure-ap.h i_configure-alsa.h \
-                 i_configure-fluidsynth.h i_configure-dummy.h \
-                 i_fileinfo.h i_utils.h i_common.h \
-                 amidi-plug-icon.xpm amidi-plug.logo.xpm \
-                 amidi-plug.midiicon.xpm
-
-LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
-
-LIBADD = $(GTK_LIBS) $(GMODULE_LIBS) -lpthread ./pcfg/libpcfg.a
-SOURCES = amidi-plug.c i_midi.c i_backend.c \
-          i_configure.c i_configure-ap.c i_configure-alsa.c \
-          i_configure-fluidsynth.c i_configure-dummy.c \
-          i_utils.c i_fileinfo.c
-
-OBJECTS = ${SOURCES:.c=.o}
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GMODULE_CFLAGS) -DAMIDIPLUGBACKENDDIR=\"$(AMIDIPLUGBACKENDDIR)\" \
-          -I../../../intl -I../../..
-
-include ../../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/arts/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/arts/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -0,0 +1,17 @@
+include ../../mk/rules.mk
+include ../../mk/init.mk
+
+SUBDIRS = arts_helper
+
+SOURCES = arts.c configure.c audio.c convert.c
+
+OBJECTIVE_LIBS = libarts$(SHARED_SUFFIX)
+
+LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
+
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -Wall $(ARTSC_CFLAGS) -I../../intl -I../..
+LIBADD = $(GTK_LIBS) $(ARTSC_LIBS) -lpthread
+
+OBJECTS = ${SOURCES:.c=.o}
+
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/arts/Makefile.in
--- a/src/arts/Makefile.in	Mon Sep 18 03:34:48 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
-
-SUBDIRS = arts_helper
-
-SOURCES = arts.c configure.c audio.c convert.c
-
-OBJECTIVE_LIBS = libarts$(SHARED_SUFFIX)
-
-LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -Wall $(ARTSC_CFLAGS) -I../../../intl -I../../..
-LIBADD = $(GTK_LIBS) $(ARTSC_LIBS) -lpthread
-
-OBJECTS = ${SOURCES:.c=.o}
-
-include ../../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/audiocompress/Makefile
--- a/src/audiocompress/Makefile	Mon Sep 18 03:34:48 2006 -0700
+++ b/src/audiocompress/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -1,5 +1,5 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+include ../../mk/rules.mk
+include ../../mk/init.mk
 
 OBJECTIVE_LIBS = libaudiocompress$(SHARED_SUFFIX)
 
@@ -9,8 +9,8 @@
 
 SOURCES = compress.c audacious-glue.c
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../..
 
 OBJECTS = ${SOURCES:.c=.o}
 
-include ../../../mk/objective.mk
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/blur_scope/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/blur_scope/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -0,0 +1,16 @@
+include ../../mk/rules.mk
+include ../../mk/init.mk
+
+OBJECTIVE_LIBS = libbscope$(SHARED_SUFFIX)
+
+LIBDIR = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR)
+
+LIBADD = $(GTK_LIBS)
+
+SOURCES = blur_scope.c config.c
+
+OBJECTS = ${SOURCES:.c=.o}
+
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
+
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/blur_scope/Makefile.in
--- a/src/blur_scope/Makefile.in	Mon Sep 18 03:34:48 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
-
-OBJECTIVE_LIBS = libbscope$(SHARED_SUFFIX)
-
-LIBDIR = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR)
-
-LIBADD = $(GTK_LIBS)
-
-SOURCES = blur_scope.c config.c
-
-OBJECTS = ${SOURCES:.c=.o}
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
-
-include ../../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/cdaudio/Makefile
--- a/src/cdaudio/Makefile	Mon Sep 18 03:34:48 2006 -0700
+++ b/src/cdaudio/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -1,5 +1,5 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+include ../../mk/rules.mk
+include ../../mk/init.mk
 
 OBJECTIVE_LIBS = libcdaudio$(SHARED_SUFFIX)
 
@@ -9,6 +9,6 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) @GTK_CFLAGS@ -I../../../intl -I../../.. -I../..
+CFLAGS += $(PICFLAGS) @GTK_CFLAGS@ -I../../intl -I../.. -I../..
 
-include ../../../mk/objective.mk
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/console/Makefile
--- a/src/console/Makefile	Mon Sep 18 03:34:48 2006 -0700
+++ b/src/console/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -1,5 +1,5 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+include ../../mk/rules.mk
+include ../../mk/init.mk
 
 OBJECTIVE_LIBS = libconsole$(SHARED_SUFFIX)
 
@@ -44,6 +44,6 @@
 OBJECTS = ${SOURCES:.cxx=.o}
 
 LIBADD += -lz $(GTK_LIBS) -lstdc++
-CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
+CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
 
-include ../../../mk/objective.mk
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/cue/Makefile
--- a/src/cue/Makefile	Mon Sep 18 03:34:48 2006 -0700
+++ b/src/cue/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -1,5 +1,5 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+include ../../mk/rules.mk
+include ../../mk/init.mk
 
 OBJECTIVE_LIBS = libcuesheet$(SHARED_SUFFIX)
 
@@ -9,10 +9,10 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
 
 CXXFLAGS = $(CFLAGS)
 
 LIBADD = $(GTK_LIBS)
 
-include ../../../mk/objective.mk
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/disk_writer/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/disk_writer/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -0,0 +1,15 @@
+include ../../mk/rules.mk
+include ../../mk/init.mk
+
+OBJECTIVE_LIBS = libdisk_writer$(SHARED_SUFFIX)
+
+LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
+
+LIBADD = $(GTK_LIBS)
+SOURCES = disk_writer.c
+
+OBJECTS = ${SOURCES:.c=.o}
+
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../..
+
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/disk_writer/Makefile.in
--- a/src/disk_writer/Makefile.in	Mon Sep 18 03:34:48 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
-
-OBJECTIVE_LIBS = libdisk_writer$(SHARED_SUFFIX)
-
-LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
-
-LIBADD = $(GTK_LIBS)
-SOURCES = disk_writer.c
-
-OBJECTS = ${SOURCES:.c=.o}
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../..
-
-include ../../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/esd/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/esd/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -0,0 +1,18 @@
+include ../../mk/rules.mk
+include ../../mk/init.mk
+
+OBJECTIVE_LIBS = libESD$(SHARED_SUFFIX)
+
+noinst_HEADERS = esdout.h
+
+LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
+
+LIBADD = $(GTK_LIBS) $(ESD_LIBS) $(OSS_LIBS)
+SOURCES = esd.c mixer.c about.c configure.c audio.c init.c
+
+OBJECTS = ${SOURCES:.c=.o}
+
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ESD_CFLAGS) \
+	-I../../intl -I../.. -I..
+
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/esd/Makefile.in
--- a/src/esd/Makefile.in	Mon Sep 18 03:34:48 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
-
-OBJECTIVE_LIBS = libESD$(SHARED_SUFFIX)
-
-noinst_HEADERS = esdout.h
-
-LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
-
-LIBADD = $(GTK_LIBS) $(ESD_LIBS) $(OSS_LIBS)
-SOURCES = esd.c mixer.c about.c configure.c audio.c init.c
-
-OBJECTS = ${SOURCES:.c=.o}
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ESD_CFLAGS) \
-	-I../../../intl -I../../.. -I..
-
-include ../../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/flac/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/flac/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -0,0 +1,39 @@
+include ../../mk/rules.mk
+include ../../mk/init.mk
+
+SUBDIRS = plugin_common
+
+noinst_HEADERS = \
+	charset.h \
+	configure.h \
+	http.h \
+	plugin.h \
+	tag.h \
+	fast_float_math_hack.h \
+	replaygain_analysis.h \
+	grabbag.h \
+	replaygain_synthesis.h
+
+OBJECTIVE_LIBS = libflac$(SHARED_SUFFIX)
+
+LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
+
+LIBADD = $(LIBFLAC_LIBS)  -L./plugin_common -lplugin_common
+
+SOURCES = \
+	charset.c \
+	configure.c \
+	fileinfo.c \
+	http.c \
+	plugin.c \
+	tag.c \
+	replaygain_synthesis.c \
+	replaygain.c \
+	replaygain_analysis.c \
+	file.c
+
+OBJECTS = ${SOURCES:.c=.o}
+
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. $(LIBFLAC_CFLAGS)
+
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/flac/Makefile.in
--- a/src/flac/Makefile.in	Mon Sep 18 03:34:48 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
-
-SUBDIRS = plugin_common
-
-noinst_HEADERS = \
-	charset.h \
-	configure.h \
-	http.h \
-	plugin.h \
-	tag.h \
-	fast_float_math_hack.h \
-	replaygain_analysis.h \
-	grabbag.h \
-	replaygain_synthesis.h
-
-OBJECTIVE_LIBS = libflac$(SHARED_SUFFIX)
-
-LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
-
-LIBADD = $(LIBFLAC_LIBS)  -L./plugin_common -lplugin_common
-
-SOURCES = \
-	charset.c \
-	configure.c \
-	fileinfo.c \
-	http.c \
-	plugin.c \
-	tag.c \
-	replaygain_synthesis.c \
-	replaygain.c \
-	replaygain_analysis.c \
-	file.c
-
-OBJECTS = ${SOURCES:.c=.o}
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../.. $(LIBFLAC_CFLAGS)
-
-include ../../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/jack/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jack/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -0,0 +1,15 @@
+include ../../mk/rules.mk
+include ../../mk/init.mk
+
+SOURCES = jack.c configure.c bio2jack.c
+
+OBJECTIVE_LIBS = libjackout$(SHARED_SUFFIX)
+
+LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
+
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -Wall $(SAMPLERATE_CFLAGS) -I../../intl -I../..
+LIBADD = $(GTK_LIBS) $(JACK_LIBS) $(SAMPLERATE_LIBS) -lpthread
+
+OBJECTS = ${SOURCES:.c=.o}
+
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/jack/Makefile.in
--- a/src/jack/Makefile.in	Mon Sep 18 03:34:48 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
-
-SOURCES = jack.c configure.c bio2jack.c
-
-OBJECTIVE_LIBS = libjackout$(SHARED_SUFFIX)
-
-LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -Wall $(SAMPLERATE_CFLAGS) -I../../../intl -I../../..
-LIBADD = $(GTK_LIBS) $(JACK_LIBS) $(SAMPLERATE_LIBS) -lpthread
-
-OBJECTS = ${SOURCES:.c=.o}
-
-include ../../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/ladspa/Makefile
--- a/src/ladspa/Makefile	Mon Sep 18 03:34:48 2006 -0700
+++ b/src/ladspa/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -1,5 +1,5 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+include ../../mk/rules.mk
+include ../../mk/init.mk
 
 OBJECTIVE_LIBS = libladspa$(SHARED_SUFFIX)
 
@@ -9,8 +9,8 @@
 
 SOURCES = ladspa.c
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../..
 
 OBJECTS = ${SOURCES:.c=.o}
 
-include ../../../mk/objective.mk
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/lirc/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/lirc/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -0,0 +1,15 @@
+include ../../mk/rules.mk
+include ../../mk/init.mk
+
+OBJECTIVE_LIBS = liblirc$(SHARED_SUFFIX)
+
+LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR)
+
+LIBADD = -llirc_client
+SOURCES = about.c lirc.c
+
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../..
+
+OBJECTS = ${SOURCES:.c=.o}
+
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/lirc/Makefile.in
--- a/src/lirc/Makefile.in	Mon Sep 18 03:34:48 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
-
-OBJECTIVE_LIBS = liblirc$(SHARED_SUFFIX)
-
-LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR)
-
-LIBADD = -llirc_client
-SOURCES = about.c lirc.c
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../..
-
-OBJECTS = ${SOURCES:.c=.o}
-
-include ../../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/m3u/Makefile
--- a/src/m3u/Makefile	Mon Sep 18 03:34:48 2006 -0700
+++ b/src/m3u/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -1,5 +1,5 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+include ../../mk/rules.mk
+include ../../mk/init.mk
 
 OBJECTIVE_LIBS = libm3u$(SHARED_SUFFIX)
 
@@ -9,10 +9,10 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
 
 CXXFLAGS = $(CFLAGS)
 
 LIBADD = $(GTK_LIBS)
 
-include ../../../mk/objective.mk
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/modplug/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/modplug/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -0,0 +1,15 @@
+include ../../mk/rules.mk
+include ../../mk/init.mk
+
+OBJECTIVE_LIBS = libmodplug$(SHARED_SUFFIX)
+SUBDIRS = archive gui
+
+LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
+
+CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I.. -I../.. -I../../intl
+LIBADD  = $(GTK_LIBS) -lstdc++ -lmodplug ./archive/libarchive.a ./gui/libgui.a
+SOURCES  = plugin.cxx modplugbmp.cxx
+
+OBJECTS = ${SOURCES:.cxx=.o}
+
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/modplug/Makefile.in
--- a/src/modplug/Makefile.in	Mon Sep 18 03:34:48 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
-
-OBJECTIVE_LIBS = libmodplug$(SHARED_SUFFIX)
-SUBDIRS = archive gui
-
-LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
-
-CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I.. -I../../.. -I../../../intl
-LIBADD  = $(GTK_LIBS) -lstdc++ -lmodplug ./archive/libarchive.a ./gui/libgui.a
-SOURCES  = plugin.cxx modplugbmp.cxx
-
-OBJECTS = ${SOURCES:.cxx=.o}
-
-include ../../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/mpg123/Makefile
--- a/src/mpg123/Makefile	Mon Sep 18 03:34:48 2006 -0700
+++ b/src/mpg123/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -1,5 +1,5 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+include ../../mk/rules.mk
+include ../../mk/init.mk
 
 OBJECTIVE_LIBS = libmpg123$(SHARED_SUFFIX)
 
@@ -13,9 +13,9 @@
 
 OBJECTS = ${SOURCES:.c=.o} tag_c_hacked.o
 
-CFLAGS   += -UPSYCHO $(PICFLAGS) $(GTK_CFLAGS) $(TAGLIB_CFLAGS) $(ARCH_DEFINES) $(LIBNMS_CFLAGS) -I../../../intl -I../../..
-CXXFLAGS += -UPSYCHO $(PICFLAGS) $(GTK_CFLAGS) $(TAGLIB_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
+CFLAGS   += -UPSYCHO $(PICFLAGS) $(GTK_CFLAGS) $(TAGLIB_CFLAGS) $(ARCH_DEFINES) $(LIBNMS_CFLAGS) -I../../intl -I../..
+CXXFLAGS += -UPSYCHO $(PICFLAGS) $(GTK_CFLAGS) $(TAGLIB_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
 
 LIBADD = -ltag_c $(GTK_LIBS) $(TAGLIB_LIBS) $(LIBNMS_LIBS)
 
-include ../../../mk/objective.mk
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/musepack/Makefile
--- a/src/musepack/Makefile	Mon Sep 18 03:34:48 2006 -0700
+++ b/src/musepack/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -1,5 +1,5 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+include ../../mk/rules.mk
+include ../../mk/init.mk
 
 OBJECTIVE_LIBS = libmpc$(SHARED_SUFFIX)
 
@@ -11,6 +11,6 @@
 
 OBJECTS = ${SOURCES:.cxx=.o}
 
-CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(TAGLIB_CFLAGS) -I../../../intl -I../../..
+CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(TAGLIB_CFLAGS) -I../../intl -I../..
 
-include ../../../mk/objective.mk
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/notify/Makefile
--- a/src/notify/Makefile	Mon Sep 18 03:34:48 2006 -0700
+++ b/src/notify/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -1,5 +1,5 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+include ../../mk/rules.mk
+include ../../mk/init.mk
 
 OBJECTIVE_LIBS = libnotify$(SHARED_SUFFIX)
 
@@ -9,10 +9,10 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(LIBNOTIFY_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../.. -DDATA_DIR=\"$(datadir)\"
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(LIBNOTIFY_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../.. -DDATA_DIR=\"$(datadir)\"
 
 CXXFLAGS = $(CFLAGS)
 
 LIBADD = $(GTK_LIBS) $(LIBNOTIFY_LIBS)
 
-include ../../../mk/objective.mk
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/paranormal/Makefile
--- a/src/paranormal/Makefile	Mon Sep 18 03:34:48 2006 -0700
+++ b/src/paranormal/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -1,7 +1,7 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+include ../../mk/rules.mk
+include ../../mk/init.mk
 
-CFLAGS += $(PICFLAGS) -Ipn/ -I../../.. $(ARCH_DEFINES) $(GTK_CFLAGS) $(SDL_CFLAGS) $(XML_CFLAGS) $(XML_CPPFLAGS)
+CFLAGS += $(PICFLAGS) -Ipn/ -I../.. $(ARCH_DEFINES) $(GTK_CFLAGS) $(SDL_CFLAGS) $(XML_CFLAGS) $(XML_CPPFLAGS)
 
 SUBDIRS = pn
 
@@ -15,4 +15,4 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-include ../../../mk/objective.mk
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/pls/Makefile
--- a/src/pls/Makefile	Mon Sep 18 03:34:48 2006 -0700
+++ b/src/pls/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -1,5 +1,5 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+include ../../mk/rules.mk
+include ../../mk/init.mk
 
 OBJECTIVE_LIBS = libpls$(SHARED_SUFFIX)
 
@@ -9,10 +9,10 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
 
 CXXFLAGS = $(CFLAGS)
 
 LIBADD = $(GTK_LIBS)
 
-include ../../../mk/objective.mk
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/pulse_audio/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pulse_audio/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -0,0 +1,15 @@
+include ../../mk/rules.mk
+include ../../mk/init.mk
+
+OBJECTIVE_LIBS = libpulse_audio$(SHARED_SUFFIX)
+
+LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
+
+LIBADD = $(GTK_LIBS) -lpulse
+SOURCES = pulse_audio.c
+
+OBJECTS = ${SOURCES:.c=.o}
+
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../..
+
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/pulse_audio/Makefile.in
--- a/src/pulse_audio/Makefile.in	Mon Sep 18 03:34:48 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
-
-OBJECTIVE_LIBS = libpulse_audio$(SHARED_SUFFIX)
-
-LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
-
-LIBADD = $(GTK_LIBS) -lpulse
-SOURCES = pulse_audio.c
-
-OBJECTS = ${SOURCES:.c=.o}
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../..
-
-include ../../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/rocklight/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/rocklight/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -0,0 +1,16 @@
+include ../../mk/rules.mk
+include ../../mk/init.mk
+
+OBJECTIVE_LIBS = librocklight$(SHARED_SUFFIX)
+
+LIBDIR = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR)
+
+LIBADD = $(GTK_LIBS)
+
+SOURCES = rocklight.c thinklight.c
+
+OBJECTS = ${SOURCES:.c=.o}
+
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../..
+
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/rocklight/Makefile.in
--- a/src/rocklight/Makefile.in	Mon Sep 18 03:34:48 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
-
-OBJECTIVE_LIBS = librocklight$(SHARED_SUFFIX)
-
-LIBDIR = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR)
-
-LIBADD = $(GTK_LIBS)
-
-SOURCES = rocklight.c thinklight.c
-
-OBJECTS = ${SOURCES:.c=.o}
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../../intl -I../../..
-
-include ../../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/scrobbler/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/scrobbler/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -0,0 +1,30 @@
+include ../../mk/rules.mk
+include ../../mk/init.mk
+
+SUBDIRS = 
+
+OBJECTIVE_LIBS = libscrobbler$(SHARED_SUFFIX)
+
+imagesdir = $(pkgdatadir)/images
+
+OBJECTIVE_DATA = audioscrobbler.png:$(imagesdir)	\
+	   audioscrobbler_badge.png:$(imagesdir)
+
+LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR)
+
+LIBADD += $(GTK_LIBS) $(CURL_LIBS) $(MUSICBRAINZ_LIBS)
+
+SOURCES = 			\
+	fmt.c			\
+	configure.c		\
+	gtkstuff.c		\
+	md5.c			\
+	queue.c			\
+	scrobbler.c		\
+	xmms_scrobbler.c
+
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(BEEP_DEFINES) $(CURL_CFLAGS) -I../../intl -I../..
+
+OBJECTS = ${SOURCES:.c=.o}
+
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/scrobbler/Makefile.in
--- a/src/scrobbler/Makefile.in	Mon Sep 18 03:34:48 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
-
-SUBDIRS = 
-
-OBJECTIVE_LIBS = libscrobbler$(SHARED_SUFFIX)
-
-imagesdir = $(pkgdatadir)/images
-
-OBJECTIVE_DATA = audioscrobbler.png:$(imagesdir)	\
-	   audioscrobbler_badge.png:$(imagesdir)
-
-LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR)
-
-LIBADD += $(GTK_LIBS) $(CURL_LIBS) $(MUSICBRAINZ_LIBS)
-
-SOURCES = 			\
-	fmt.c			\
-	configure.c		\
-	gtkstuff.c		\
-	md5.c			\
-	queue.c			\
-	scrobbler.c		\
-	xmms_scrobbler.c
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(BEEP_DEFINES) $(CURL_CFLAGS) -I../../../intl -I../../..
-
-OBJECTS = ${SOURCES:.c=.o}
-
-include ../../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/sexypsf/Makefile
--- a/src/sexypsf/Makefile	Mon Sep 18 03:34:48 2006 -0700
+++ b/src/sexypsf/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -1,5 +1,5 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+include ../../mk/rules.mk
+include ../../mk/init.mk
 
 OBJECTIVE_LIBS = libsexypsf$(SHARED_SUFFIX)
 
@@ -23,9 +23,9 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += -Wno-nonnull $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../.. -Ispu/ -I.
+CFLAGS += -Wno-nonnull $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. -Ispu/ -I.
 
-include ../../../mk/objective.mk
+include ../../mk/objective.mk
 
 clean-posthook:
 	@rm -f spu/*.o
diff -r ada5b8bf1471 -r cf1054422f81 src/sid/Makefile
--- a/src/sid/Makefile	Mon Sep 18 03:34:48 2006 -0700
+++ b/src/sid/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -1,5 +1,5 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+include ../../mk/rules.mk
+include ../../mk/init.mk
 
 OBJECTIVE_LIBS = libsid$(SHARED_SUFFIX)
 
@@ -9,8 +9,8 @@
 EXTRA_DIST = xmms-sid-logo.xpm
 
 # Generals
-CFLAGS   += $(PICFLAGS) -D_REENTRANT $(PLUGIN_CFLAGS) $(SIDPLAY1_INCLUDES) $(SIDPLAY2_INCLUDES) $(BUILDERS_INCLUDES) $(GTK_CFLAGS) -I../../../intl -I../../..
-CXXFLAGS  += $(PICFLAGS) -D_REENTRANT $(PLUGIN_CFLAGS) $(SIDPLAY1_INCLUDES) $(SIDPLAY2_INCLUDES) $(BUILDERS_INCLUDES) $(GTK_CFLAGS) -I../../../intl -I../../..
+CFLAGS   += $(PICFLAGS) -D_REENTRANT $(PLUGIN_CFLAGS) $(SIDPLAY1_INCLUDES) $(SIDPLAY2_INCLUDES) $(BUILDERS_INCLUDES) $(GTK_CFLAGS) -I../../intl -I../..
+CXXFLAGS  += $(PICFLAGS) -D_REENTRANT $(PLUGIN_CFLAGS) $(SIDPLAY1_INCLUDES) $(SIDPLAY2_INCLUDES) $(BUILDERS_INCLUDES) $(GTK_CFLAGS) -I../../intl -I../..
 
 # Generated libraries
 
@@ -39,4 +39,4 @@
 OBJECTS1 = ${SOURCES:.c=.o}
 OBJECTS = ${OBJECTS1:.cc=.o}
 
-include ../../../mk/objective.mk
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/song_change/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/song_change/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -0,0 +1,16 @@
+include ../../mk/rules.mk
+include ../../mk/init.mk
+
+OBJECTIVE_LIBS = libsong_change$(SHARED_SUFFIX)
+
+LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR)
+
+LIBADD = $(GTK_LIBS)
+
+SOURCES = song_change.c
+
+OBJECTS = ${SOURCES:.c=.o}
+
+CFLAGS += $(PICFLAGS) $(BEEP_DEFINES) $(GTK_CFLAGS) -I../../intl -I../..
+
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/song_change/Makefile.in
--- a/src/song_change/Makefile.in	Mon Sep 18 03:34:48 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
-
-OBJECTIVE_LIBS = libsong_change$(SHARED_SUFFIX)
-
-LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR)
-
-LIBADD = $(GTK_LIBS)
-
-SOURCES = song_change.c
-
-OBJECTS = ${SOURCES:.c=.o}
-
-CFLAGS += $(PICFLAGS) $(BEEP_DEFINES) $(GTK_CFLAGS) -I../../../intl -I../../..
-
-include ../../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/stereo_plugin/Makefile
--- a/src/stereo_plugin/Makefile	Mon Sep 18 03:34:48 2006 -0700
+++ b/src/stereo_plugin/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -1,5 +1,5 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+include ../../mk/rules.mk
+include ../../mk/init.mk
 
 OBJECTIVE_LIBS = libstereo$(SHARED_SUFFIX)
 
@@ -9,8 +9,8 @@
 
 SOURCES = stereo.c
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../..
 
 OBJECTS = ${SOURCES:.c=.o}
 
-include ../../../mk/objective.mk
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/sun/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/sun/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -0,0 +1,19 @@
+include ../../mk/rules.mk
+include ../../mk/init.mk
+
+sunsources =	sun.c	    \
+		audio.c	    \
+		convert.c   \
+		mixer.c	    \
+		configure.c \
+		about.c
+
+LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
+OBJECTIVE_LIBS = libsun$(SHARED_SUFFIX)
+
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../..
+LIBADD = $(GTK_LIBS)
+SOURCES= $(sunsources)
+OBJECTS= ${SOURCES:.c=.o}
+
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/sun/Makefile.in
--- a/src/sun/Makefile.in	Mon Sep 18 03:34:48 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
-
-sunsources =	sun.c	    \
-		audio.c	    \
-		convert.c   \
-		mixer.c	    \
-		configure.c \
-		about.c
-
-LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
-OBJECTIVE_LIBS = libsun$(SHARED_SUFFIX)
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../..
-LIBADD = $(GTK_LIBS)
-SOURCES= $(sunsources)
-OBJECTS= ${SOURCES:.c=.o}
-
-include ../../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/timidity/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/timidity/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -0,0 +1,6 @@
+include ../../mk/rules.mk
+include ../../mk/init.mk
+
+SUBDIRS = libtimidity src
+
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/timidity/Makefile.in
--- a/src/timidity/Makefile.in	Mon Sep 18 03:34:48 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
-
-SUBDIRS = libtimidity src
-
-include ../../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/tonegen/Makefile
--- a/src/tonegen/Makefile	Mon Sep 18 03:34:48 2006 -0700
+++ b/src/tonegen/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -1,5 +1,5 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+include ../../mk/rules.mk
+include ../../mk/init.mk
 
 OBJECTIVE_LIBS = libtonegen$(SHARED_SUFFIX)
 
@@ -9,6 +9,6 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) @GTK_CFLAGS@ -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) @GTK_CFLAGS@ -I../../intl -I../..
 
-include ../../../mk/objective.mk
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/voice_removal/Makefile
--- a/src/voice_removal/Makefile	Mon Sep 18 03:34:48 2006 -0700
+++ b/src/voice_removal/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -1,5 +1,5 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+include ../../mk/rules.mk
+include ../../mk/init.mk
 
 OBJECTIVE_LIBS = libvoice_removal$(SHARED_SUFFIX)
 
@@ -9,8 +9,8 @@
 
 SOURCES = voice_removal.c
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../..
 
 OBJECTS = ${SOURCES:.c=.o}
 
-include ../../../mk/objective.mk
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/vorbis/Makefile
--- a/src/vorbis/Makefile	Mon Sep 18 03:34:48 2006 -0700
+++ b/src/vorbis/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -1,5 +1,5 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+include ../../mk/rules.mk
+include ../../mk/init.mk
 
 OBJECTIVE_LIBS = libvorbis$(SHARED_SUFFIX)
 
@@ -11,6 +11,6 @@
 
 LIBADD = $(OGG_VORBIS_LIBS)
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../.. -I../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. -I../..
 
-include ../../../mk/objective.mk
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/wav/Makefile
--- a/src/wav/Makefile	Mon Sep 18 03:34:48 2006 -0700
+++ b/src/wav/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -1,5 +1,5 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+include ../../mk/rules.mk
+include ../../mk/init.mk
 
 OBJECTIVE_LIBS = libwav$(SHARED_SUFFIX)
 
@@ -9,8 +9,8 @@
 
 LIBADD = -L/usr/local/lib $(SNDFILE_LIBS)
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../..
 
 OBJECTS = ${SOURCES:.c=.o}
 
-include ../../../mk/objective.mk
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/wma/Makefile
--- a/src/wma/Makefile	Mon Sep 18 03:34:48 2006 -0700
+++ b/src/wma/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -1,5 +1,5 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+include ../../mk/rules.mk
+include ../../mk/init.mk
 
 OBJECTIVE_LIBS = libwma$(SHARED_SUFFIX)
 
@@ -13,6 +13,6 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../.. -I./libffwma -std=c99
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. -I./libffwma -std=c99
 
-include ../../../mk/objective.mk
+include ../../mk/objective.mk
diff -r ada5b8bf1471 -r cf1054422f81 src/xspf/Makefile
--- a/src/xspf/Makefile	Mon Sep 18 03:34:48 2006 -0700
+++ b/src/xspf/Makefile	Mon Sep 18 03:38:44 2006 -0700
@@ -1,5 +1,5 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+include ../../mk/rules.mk
+include ../../mk/init.mk
 
 OBJECTIVE_LIBS = libxspf$(SHARED_SUFFIX)
 
@@ -9,10 +9,10 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) -I../../../intl -I../../..
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) -I../../intl -I../..
 
 CXXFLAGS = $(CFLAGS)
 
 LIBADD = $(GTK_LIBS) $(XML_LIBS)
 
-include ../../../mk/objective.mk
+include ../../mk/objective.mk