# HG changeset patch
# User nenolod
# Date 1158575688 25200
# Node ID ada5b8bf14719cc6f2cbcc101780c7bc24195aec
# Parent  1564e11adc2b7b08e54811b2f99d9591c4abed2d
[svn] - and some more of that wonderful Makefile.in -> Makefile reduction

diff -r 1564e11adc2b -r ada5b8bf1471 ChangeLog
--- a/ChangeLog	Mon Sep 18 03:31:09 2006 -0700
+++ b/ChangeLog	Mon Sep 18 03:34:48 2006 -0700
@@ -1,3 +1,14 @@
+2006-09-18 10:31:09 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [30]
+  - more Makefile reduction
+  
+
+  Changes:        Modified:
+  +20 -3          trunk/configure.ac  
+  +26 -20         trunk/src/adplug/Makefile.in  
+  +0 -26          trunk/src/adplug/core/Makefile.in  
+
+
 2006-09-18 10:27:46 +0000  William Pitcock <nenolod@nenolod.net>
   revision [28]
   - remove some unnecessary Makefile.in's and replace them with normal Makefiles
diff -r 1564e11adc2b -r ada5b8bf1471 configure.ac
--- a/configure.ac	Mon Sep 18 03:31:09 2006 -0700
+++ b/configure.ac	Mon Sep 18 03:34:48 2006 -0700
@@ -1067,7 +1067,6 @@
 	src/modplug/gui/Makefile
 	src/flac/Makefile
 	src/flac/plugin_common/Makefile
-	src/sid/Makefile
 	src/timidity/Makefile
 	src/timidity/libtimidity/Makefile
 	src/timidity/src/Makefile
@@ -1081,10 +1080,6 @@
 	src/song_change/Makefile
 	src/lirc/Makefile
 	src/scrobbler/Makefile
-	src/audiocompress/Makefile
-	src/ladspa/Makefile
-	src/stereo_plugin/Makefile
-	src/voice_removal/Makefile
 	mk/rules.mk
 ])
 
diff -r 1564e11adc2b -r ada5b8bf1471 src/audiocompress/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/audiocompress/Makefile	Mon Sep 18 03:34:48 2006 -0700
@@ -0,0 +1,16 @@
+include ../../../mk/rules.mk
+include ../../../mk/init.mk
+
+OBJECTIVE_LIBS = libaudiocompress$(SHARED_SUFFIX)
+
+LIBDIR = $(plugindir)/$(EFFECT_PLUGIN_DIR)
+
+LIBADD = $(GTK_LIBS)
+
+SOURCES = compress.c audacious-glue.c
+
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../..
+
+OBJECTS = ${SOURCES:.c=.o}
+
+include ../../../mk/objective.mk
diff -r 1564e11adc2b -r ada5b8bf1471 src/audiocompress/Makefile.in
--- a/src/audiocompress/Makefile.in	Mon Sep 18 03:31:09 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 = libaudiocompress$(SHARED_SUFFIX)
-
-LIBDIR = $(plugindir)/$(EFFECT_PLUGIN_DIR)
-
-LIBADD = $(GTK_LIBS)
-
-SOURCES = compress.c audacious-glue.c
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../..
-
-OBJECTS = ${SOURCES:.c=.o}
-
-include ../../../mk/objective.mk
diff -r 1564e11adc2b -r ada5b8bf1471 src/ladspa/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/ladspa/Makefile	Mon Sep 18 03:34:48 2006 -0700
@@ -0,0 +1,16 @@
+include ../../../mk/rules.mk
+include ../../../mk/init.mk
+
+OBJECTIVE_LIBS = libladspa$(SHARED_SUFFIX)
+
+LIBDIR = $(plugindir)/$(EFFECT_PLUGIN_DIR)
+
+LIBADD = $(GTK_LIBS)
+
+SOURCES = ladspa.c
+
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../..
+
+OBJECTS = ${SOURCES:.c=.o}
+
+include ../../../mk/objective.mk
diff -r 1564e11adc2b -r ada5b8bf1471 src/ladspa/Makefile.in
--- a/src/ladspa/Makefile.in	Mon Sep 18 03:31:09 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 = libladspa$(SHARED_SUFFIX)
-
-LIBDIR = $(plugindir)/$(EFFECT_PLUGIN_DIR)
-
-LIBADD = $(GTK_LIBS)
-
-SOURCES = ladspa.c
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../..
-
-OBJECTS = ${SOURCES:.c=.o}
-
-include ../../../mk/objective.mk
diff -r 1564e11adc2b -r ada5b8bf1471 src/sid/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/sid/Makefile	Mon Sep 18 03:34:48 2006 -0700
@@ -0,0 +1,42 @@
+include ../../../mk/rules.mk
+include ../../../mk/init.mk
+
+OBJECTIVE_LIBS = libsid$(SHARED_SUFFIX)
+
+###
+### Source targets
+###
+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../../..
+
+# Generated libraries
+
+LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
+
+LDFLAGS += $(BUILDERS_LDFLAGS)
+LIBADD  = $(SIDPLAY1_LDADD) $(SIDPLAY2_LDADD) $(RESID_LDADD) $(HARDSID_LDADD) $(GTK_LIBS) -lstdc++
+SOURCES =	\
+	xs_init.c	\
+	xs_about.c	\
+	xs_support.c	\
+	xs_config.c	\
+	xs_md5.c	\
+	xs_length.c	\
+	xs_genui.c	\
+	xs_glade.c	\
+	xs_interface.c	\
+	xs_stil.c	\
+	xs_title.c	\
+	xs_fileinfo.c	\
+	xs_filter.c	\
+	xs_sidplay1.cc	\
+	xs_sidplay2.cc	\
+	xmms-sid.c
+
+OBJECTS1 = ${SOURCES:.c=.o}
+OBJECTS = ${OBJECTS1:.cc=.o}
+
+include ../../../mk/objective.mk
diff -r 1564e11adc2b -r ada5b8bf1471 src/sid/Makefile.in
--- a/src/sid/Makefile.in	Mon Sep 18 03:31:09 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
-
-OBJECTIVE_LIBS = libsid$(SHARED_SUFFIX)
-
-###
-### Source targets
-###
-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../../..
-
-# Generated libraries
-
-LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
-
-LDFLAGS += $(BUILDERS_LDFLAGS)
-LIBADD  = $(SIDPLAY1_LDADD) $(SIDPLAY2_LDADD) $(RESID_LDADD) $(HARDSID_LDADD) $(GTK_LIBS) -lstdc++
-SOURCES =	\
-	xs_init.c	\
-	xs_about.c	\
-	xs_support.c	\
-	xs_config.c	\
-	xs_md5.c	\
-	xs_length.c	\
-	xs_genui.c	\
-	xs_glade.c	\
-	xs_interface.c	\
-	xs_stil.c	\
-	xs_title.c	\
-	xs_fileinfo.c	\
-	xs_filter.c	\
-	xs_sidplay1.cc	\
-	xs_sidplay2.cc	\
-	xmms-sid.c
-
-OBJECTS1 = ${SOURCES:.c=.o}
-OBJECTS = ${OBJECTS1:.cc=.o}
-
-include ../../../mk/objective.mk
diff -r 1564e11adc2b -r ada5b8bf1471 src/stereo_plugin/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/stereo_plugin/Makefile	Mon Sep 18 03:34:48 2006 -0700
@@ -0,0 +1,16 @@
+include ../../../mk/rules.mk
+include ../../../mk/init.mk
+
+OBJECTIVE_LIBS = libstereo$(SHARED_SUFFIX)
+
+LIBDIR = $(plugindir)/$(EFFECT_PLUGIN_DIR)
+
+LIBADD = $(GTK_LIBS)
+
+SOURCES = stereo.c
+
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../..
+
+OBJECTS = ${SOURCES:.c=.o}
+
+include ../../../mk/objective.mk
diff -r 1564e11adc2b -r ada5b8bf1471 src/stereo_plugin/Makefile.in
--- a/src/stereo_plugin/Makefile.in	Mon Sep 18 03:31:09 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 = libstereo$(SHARED_SUFFIX)
-
-LIBDIR = $(plugindir)/$(EFFECT_PLUGIN_DIR)
-
-LIBADD = $(GTK_LIBS)
-
-SOURCES = stereo.c
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../..
-
-OBJECTS = ${SOURCES:.c=.o}
-
-include ../../../mk/objective.mk
diff -r 1564e11adc2b -r ada5b8bf1471 src/voice_removal/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/voice_removal/Makefile	Mon Sep 18 03:34:48 2006 -0700
@@ -0,0 +1,16 @@
+include ../../../mk/rules.mk
+include ../../../mk/init.mk
+
+OBJECTIVE_LIBS = libvoice_removal$(SHARED_SUFFIX)
+
+LIBDIR = $(plugindir)/$(EFFECT_PLUGIN_DIR)
+
+LIBADD = $(GTK_LIBS)
+
+SOURCES = voice_removal.c
+
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../..
+
+OBJECTS = ${SOURCES:.c=.o}
+
+include ../../../mk/objective.mk
diff -r 1564e11adc2b -r ada5b8bf1471 src/voice_removal/Makefile.in
--- a/src/voice_removal/Makefile.in	Mon Sep 18 03:31:09 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 = libvoice_removal$(SHARED_SUFFIX)
-
-LIBDIR = $(plugindir)/$(EFFECT_PLUGIN_DIR)
-
-LIBADD = $(GTK_LIBS)
-
-SOURCES = voice_removal.c
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../intl -I../../..
-
-OBJECTS = ${SOURCES:.c=.o}
-
-include ../../../mk/objective.mk