Mercurial > audlegacy-plugins
changeset 22:eab0c4241348 trunk
[svn] - finish up on the Makefile reduction
| author | nenolod |
|---|---|
| date | Mon, 18 Sep 2006 03:53:06 -0700 |
| parents | 5dfe560466c9 |
| children | 21320918cc08 |
| files | ChangeLog configure.ac src/arts/arts_helper/Makefile src/arts/arts_helper/Makefile.in src/flac/plugin_common/Makefile src/flac/plugin_common/Makefile.in src/modplug/archive/Makefile src/modplug/archive/Makefile.in src/modplug/gui/Makefile src/modplug/gui/Makefile.in src/timidity/libtimidity/Makefile src/timidity/libtimidity/Makefile.in src/timidity/src/Makefile src/timidity/src/Makefile.in |
| diffstat | 14 files changed, 126 insertions(+), 123 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Sep 18 03:49:03 2006 -0700 +++ b/ChangeLog Mon Sep 18 03:53:06 2006 -0700 @@ -1,3 +1,12 @@ +2006-09-18 10:49:03 +0000 William Pitcock <nenolod@nenolod.net> + revision [42] + - update configure.ac + + + Changes: Modified: + +0 -4 trunk/configure.ac + + 2006-09-18 10:48:36 +0000 William Pitcock <nenolod@nenolod.net> revision [40] - makefile cleanups
--- a/configure.ac Mon Sep 18 03:49:03 2006 -0700 +++ b/configure.ac Mon Sep 18 03:53:06 2006 -0700 @@ -1053,12 +1053,6 @@ AC_SUBST(CONTAINER_PLUGINS) AC_CONFIG_FILES([ - src/arts/arts_helper/Makefile - src/modplug/archive/Makefile - src/modplug/gui/Makefile - src/flac/plugin_common/Makefile - src/timidity/libtimidity/Makefile - src/timidity/src/Makefile mk/rules.mk ])
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/arts/arts_helper/Makefile Mon Sep 18 03:53:06 2006 -0700 @@ -0,0 +1,15 @@ +include ../../../mk/rules.mk +include ../../../mk/init.mk + +SOURCES = arts_helper.c + +OBJECTIVE_BINS = audacious-arts-helper + +LDFLAGS = -Wl,-export-dynamic +LIBADD = $(ARTSC_LIBS) + +CFLAGS += $(ARTSC_CFLAGS) -I../../../../intl -I../../../.. + +OBJECTS = ${SOURCES:.c=.o} + +include ../../../mk/objective.mk
--- a/src/arts/arts_helper/Makefile.in Mon Sep 18 03:49:03 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 = arts_helper.c - -OBJECTIVE_BINS = audacious-arts-helper - -LDFLAGS = -Wl,-export-dynamic -LIBADD = $(ARTSC_LIBS) - -CFLAGS += $(ARTSC_CFLAGS) -I../../../../intl -I../../../.. - -OBJECTS = ${SOURCES:.c=.o} - -include ../../../../mk/objective.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/flac/plugin_common/Makefile Mon Sep 18 03:53:06 2006 -0700 @@ -0,0 +1,26 @@ +include ../../../mk/rules.mk +include ../../../mk/init.mk + +CFLAGS += $(PICFLAGS) -I.. -I../../../.. + +OBJECTIVE_LIBS_NOINST = libplugin_common.a + +noinst_HEADERS = \ + all.h \ + charset.h \ + defs.h \ + dither.h \ + locale_hack.h \ + tags.h + +SOURCES = \ + charset.c \ + dither.c \ + tags.c + +OBJECTS = ${SOURCES:.c=.o} + +libplugin_common.a: $(OBJECTS) + $(AR) cq $@ $(OBJECTS) + +include ../../../mk/objective.mk
--- a/src/flac/plugin_common/Makefile.in Mon Sep 18 03:49:03 2006 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -include ../../../../mk/rules.mk -include ../../../../mk/init.mk - -CFLAGS += $(PICFLAGS) -I.. -I../../../.. - -OBJECTIVE_LIBS_NOINST = libplugin_common.a - -noinst_HEADERS = \ - all.h \ - charset.h \ - defs.h \ - dither.h \ - locale_hack.h \ - tags.h - -SOURCES = \ - charset.c \ - dither.c \ - tags.c - -OBJECTS = ${SOURCES:.c=.o} - -libplugin_common.a: $(OBJECTS) - $(AR) cq $@ $(OBJECTS) - -include ../../../../mk/objective.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/modplug/archive/Makefile Mon Sep 18 03:53:06 2006 -0700 @@ -0,0 +1,18 @@ +include ../../../mk/rules.mk +include ../../../mk/init.mk + +CXXFLAGS += $(PICFLAGS) -I../../.. + +OBJECTIVE_LIBS_NOINST = libarchive.a + +SOURCES = archive.cxx \ + open.cxx \ + arch_raw.cxx \ + arch_gzip.cxx \ + arch_zip.cxx \ + arch_rar.cxx \ + arch_bz2.cxx + +OBJECTS = ${SOURCES:.cxx=.o} + +include ../../../mk/objective.mk
--- a/src/modplug/archive/Makefile.in Mon Sep 18 03:49:03 2006 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -include ../../../../mk/rules.mk -include ../../../../mk/init.mk - -CXXFLAGS += $(PICFLAGS) -I../../.. - -OBJECTIVE_LIBS_NOINST = libarchive.a - -SOURCES = archive.cxx \ - open.cxx \ - arch_raw.cxx \ - arch_gzip.cxx \ - arch_zip.cxx \ - arch_rar.cxx \ - arch_bz2.cxx - -OBJECTS = ${SOURCES:.cxx=.o} - -include ../../../../mk/objective.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/modplug/gui/Makefile Mon Sep 18 03:53:06 2006 -0700 @@ -0,0 +1,12 @@ +include ../../../mk/rules.mk +include ../../../mk/init.mk + +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../../intl -I../../../.. +CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../../intl -I../../../.. + +OBJECTIVE_LIBS_NOINST = libgui.a +SOURCES = main.cxx support.cxx interface.cxx callbacks.cxx + +OBJECTS = ${SOURCES:.cxx=.o} + +include ../../../mk/objective.mk
--- a/src/modplug/gui/Makefile.in Mon Sep 18 03:49:03 2006 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -include ../../../../mk/rules.mk -include ../../../../mk/init.mk - -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../../intl -I../../../.. -CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../../intl -I../../../.. - -OBJECTIVE_LIBS_NOINST = libgui.a -SOURCES = main.cxx support.cxx interface.cxx callbacks.cxx - -OBJECTS = ${SOURCES:.cxx=.o} - -include ../../../../mk/objective.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/timidity/libtimidity/Makefile Mon Sep 18 03:53:06 2006 -0700 @@ -0,0 +1,27 @@ +include ../../../mk/rules.mk +include ../../../mk/init.mk + +OBJECTIVE_LIBS_NOINST = libtimidity.a + +SOURCES = \ + common.c \ + instrum.c \ + instrum_dls.c \ + mix.c \ + options.h \ + output.c \ + playmidi.c \ + readmidi.c \ + resample.c \ + stream.c \ + tables.c \ + timidity.c + +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../../intl -I../../../.. + +OBJECTS = ${SOURCES:.c=.o} + +include ../../../mk/objective.mk + +libtimidity.a: $(OBJECTS) + $(AR) cq $@ $(OBJECTS)
--- a/src/timidity/libtimidity/Makefile.in Mon Sep 18 03:49:03 2006 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -include ../../../../mk/rules.mk -include ../../../../mk/init.mk - -OBJECTIVE_LIBS_NOINST = libtimidity.a - -SOURCES = \ - common.c \ - instrum.c \ - instrum_dls.c \ - mix.c \ - options.h \ - output.c \ - playmidi.c \ - readmidi.c \ - resample.c \ - stream.c \ - tables.c \ - timidity.c - -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../../intl -I../../../.. - -OBJECTS = ${SOURCES:.c=.o} - -include ../../../../mk/objective.mk - -libtimidity.a: $(OBJECTS) - $(AR) cq $@ $(OBJECTS)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/timidity/src/Makefile Mon Sep 18 03:53:06 2006 -0700 @@ -0,0 +1,19 @@ +include ../../../mk/rules.mk +include ../../../mk/init.mk + +OBJECTIVE_LIBS = libtimidity$(SHARED_SUFFIX) + +LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) + +LIBADD = ../libtimidity/libtimidity.a + +SOURCES = \ + callbacks.c \ + interface.c \ + xmms-timidity.c \ + +OBJECTS = ${SOURCES:.c=.o} + +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../../intl -I../../../.. -I../libtimidity + +include ../../../mk/objective.mk
--- a/src/timidity/src/Makefile.in Mon Sep 18 03:49:03 2006 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -include ../../../../mk/rules.mk -include ../../../../mk/init.mk - -OBJECTIVE_LIBS = libtimidity$(SHARED_SUFFIX) - -LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) - -LIBADD = ../libtimidity/libtimidity.a - -SOURCES = \ - callbacks.c \ - interface.c \ - xmms-timidity.c \ - -OBJECTS = ${SOURCES:.c=.o} - -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../../intl -I../../../.. -I../libtimidity - -include ../../../../mk/objective.mk