# HG changeset patch # User nenolod # Date 1158575469 25200 # Node ID 1564e11adc2b7b08e54811b2f99d9591c4abed2d # Parent 772c5d3af06683a6dbd4bf4a8a3a8266c7baa8e6 [svn] - more Makefile reduction diff -r 772c5d3af066 -r 1564e11adc2b ChangeLog --- a/ChangeLog Mon Sep 18 03:27:46 2006 -0700 +++ b/ChangeLog Mon Sep 18 03:31:09 2006 -0700 @@ -1,3 +1,25 @@ +2006-09-18 10:27:46 +0000 William Pitcock + revision [28] + - remove some unnecessary Makefile.in's and replace them with normal Makefiles + + + Changes: Modified: + +6 -13 trunk/configure.ac + +24 -6 trunk/src/aac/Makefile.in + +16 -24 trunk/src/aac/libfaad2/Makefile.in + +19 -16 trunk/src/aac/mp4ff/Makefile.in + +14 -19 trunk/src/aac/src/Makefile.in + +21 -14 trunk/src/cdaudio/Makefile.in + +16 -21 trunk/src/mpg123/Makefile.in + +31 -16 trunk/src/musepack/Makefile.in + +14 -31 trunk/src/sexypsf/Makefile.in + +16 -14 trunk/src/tonegen/Makefile.in + +16 -16 trunk/src/vorbis/Makefile.in + +18 -16 trunk/src/wav/Makefile.in + +23 -18 trunk/src/wma/Makefile.in + +0 -23 trunk/src/wma/libffwma/Makefile.in + + 2006-09-18 10:17:45 +0000 William Pitcock revision [26] - remove unused dirs diff -r 772c5d3af066 -r 1564e11adc2b configure.ac --- a/configure.ac Mon Sep 18 03:27:46 2006 -0700 +++ b/configure.ac Mon Sep 18 03:31:09 2006 -0700 @@ -1053,7 +1053,6 @@ AC_SUBST(CONTAINER_PLUGINS) AC_CONFIG_FILES([ - src/Makefile src/OSS/Makefile src/esd/Makefile src/alsa/Makefile @@ -1072,8 +1071,6 @@ src/timidity/Makefile src/timidity/libtimidity/Makefile src/timidity/src/Makefile - src/adplug/Makefile - src/adplug/core/Makefile src/amidi-plug/Makefile src/amidi-plug/pcfg/Makefile src/amidi-plug/backend-alsa/Makefile diff -r 772c5d3af066 -r 1564e11adc2b src/adplug/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/adplug/Makefile Mon Sep 18 03:31:09 2006 -0700 @@ -0,0 +1,20 @@ +include ../../../mk/rules.mk +include ../../../mk/init.mk + +SUBDIRS = core +OBJECTIVE_LIBS = libadplug$(SHARED_SUFFIX) + +LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) + +LIBADD = ./core/libadplugcore.a $(BINIO_LIBS) -lstdc++ + +SOURCES = adplug-xmms.cc + +OBJECTS = ${SOURCES:.cc=.o} + +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(BINIO_CFLAGS) \ + -I../../../intl -I../../.. -I./core +CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(BINIO_CFLAGS) \ + -I../../../intl -I../../.. -I./core + +include ../../../mk/objective.mk diff -r 772c5d3af066 -r 1564e11adc2b src/adplug/Makefile.in --- a/src/adplug/Makefile.in Mon Sep 18 03:27:46 2006 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -include ../../../mk/rules.mk -include ../../../mk/init.mk - -SUBDIRS = core -OBJECTIVE_LIBS = libadplug$(SHARED_SUFFIX) - -LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) - -LIBADD = ./core/libadplugcore.a $(BINIO_LIBS) -lstdc++ - -SOURCES = adplug-xmms.cc - -OBJECTS = ${SOURCES:.cc=.o} - -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(BINIO_CFLAGS) \ - -I../../../intl -I../../.. -I./core -CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(BINIO_CFLAGS) \ - -I../../../intl -I../../.. -I./core - -include ../../../mk/objective.mk diff -r 772c5d3af066 -r 1564e11adc2b src/adplug/core/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/adplug/core/Makefile Mon Sep 18 03:31:09 2006 -0700 @@ -0,0 +1,26 @@ +include ../../../../mk/rules.mk +include ../../../../mk/init.mk + +OBJECTIVE_LIBS_NOINST = libadplugcore.a + +SOURCES = adplug.cxx emuopl.cxx fmopl.c diskopl.cxx debug.c fprovide.cxx \ +player.cxx database.cxx hsc.cxx sng.cxx imf.cxx players.cxx protrack.cxx \ +a2m.cxx adtrack.cxx amd.cxx bam.cxx d00.cxx dfm.cxx dmo.cxx hsp.cxx ksm.cxx \ +mad.cxx mid.cxx mkj.cxx cff.cxx dtm.cxx fmc.cxx mtk.cxx rad.cxx raw.cxx \ +sa2.cxx s3m.cxx xad.cxx flash.cxx bmf.cxx hybrid.cxx hyp.cxx psi.cxx rat.cxx \ +u6m.cxx rol.cxx xsm.cxx adlibemu.c dro.cxx lds.cxx temuopl.cxx msc.cxx rix.cxx \ +adl.cxx + +noinst_HEADERS = adplug.h emuopl.h fmopl.h silentopl.h opl.h diskopl.h \ +a2m.h amd.h bam.h d00.h dfm.h hsc.h hsp.h imf.h ksm.h lds.h mid.h mkj.h mtk.h \ +protrack.h rad.h raw.h sa2.h sng.h u6m.h player.h fmc.h mad.h xad.h bmf.h \ +flash.h hyp.h psi.h rat.h hybrid.h rol.h adtrack.h cff.h dtm.h fprovide.h \ +database.h players.h xsm.h adlibemu.h kemuopl.h dro.h dmo.h s3m.h temuopl.h \ +msc.h rix.h adl.h + +CXXFLAGS += $(PICFLAGS) $(BINIO_CFLAGS) -I../../../../intl -I../../../.. -Dstricmp=strcasecmp +CFLAGS += $(PICFLAGS) $(BINIO_CFLAGS) -I../../../../intl -I../../../.. -Dstricmp=strcasecmp + +OBJECTS = ${SOURCES:.c=.o} ${SOURCES:.cxx=.o} + +include ../../../../mk/objective.mk diff -r 772c5d3af066 -r 1564e11adc2b src/adplug/core/Makefile.in --- a/src/adplug/core/Makefile.in Mon Sep 18 03:27:46 2006 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -include ../../../../mk/rules.mk -include ../../../../mk/init.mk - -OBJECTIVE_LIBS_NOINST = libadplugcore.a - -SOURCES = adplug.cxx emuopl.cxx fmopl.c diskopl.cxx debug.c fprovide.cxx \ -player.cxx database.cxx hsc.cxx sng.cxx imf.cxx players.cxx protrack.cxx \ -a2m.cxx adtrack.cxx amd.cxx bam.cxx d00.cxx dfm.cxx dmo.cxx hsp.cxx ksm.cxx \ -mad.cxx mid.cxx mkj.cxx cff.cxx dtm.cxx fmc.cxx mtk.cxx rad.cxx raw.cxx \ -sa2.cxx s3m.cxx xad.cxx flash.cxx bmf.cxx hybrid.cxx hyp.cxx psi.cxx rat.cxx \ -u6m.cxx rol.cxx xsm.cxx adlibemu.c dro.cxx lds.cxx temuopl.cxx msc.cxx rix.cxx \ -adl.cxx - -noinst_HEADERS = adplug.h emuopl.h fmopl.h silentopl.h opl.h diskopl.h \ -a2m.h amd.h bam.h d00.h dfm.h hsc.h hsp.h imf.h ksm.h lds.h mid.h mkj.h mtk.h \ -protrack.h rad.h raw.h sa2.h sng.h u6m.h player.h fmc.h mad.h xad.h bmf.h \ -flash.h hyp.h psi.h rat.h hybrid.h rol.h adtrack.h cff.h dtm.h fprovide.h \ -database.h players.h xsm.h adlibemu.h kemuopl.h dro.h dmo.h s3m.h temuopl.h \ -msc.h rix.h adl.h - -CXXFLAGS += $(PICFLAGS) $(BINIO_CFLAGS) -I../../../../intl -I../../../.. -Dstricmp=strcasecmp -CFLAGS += $(PICFLAGS) $(BINIO_CFLAGS) -I../../../../intl -I../../../.. -Dstricmp=strcasecmp - -OBJECTS = ${SOURCES:.c=.o} ${SOURCES:.cxx=.o} - -include ../../../../mk/objective.mk