changeset 591:c447826497ce trunk

[svn] timidity conversion
author nenolod
date Thu, 02 Feb 2006 18:47:47 -0800
parents 5065078fabc4
children 7bbe7a94bc20
files Plugins/Input/timidity/Makefile.am Plugins/Input/timidity/Makefile.in Plugins/Input/timidity/libtimidity/Makefile.am Plugins/Input/timidity/libtimidity/Makefile.in Plugins/Input/timidity/src/Makefile.am Plugins/Input/timidity/src/Makefile.in
diffstat 6 files changed, 43 insertions(+), 48 deletions(-) [+]
line wrap: on
line diff
--- a/Plugins/Input/timidity/Makefile.am	Thu Feb 02 18:33:24 2006 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-if ENABLE_TIMIDITY
-SUBDIRS = libtimidity src
-endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Plugins/Input/timidity/Makefile.in	Thu Feb 02 18:47:47 2006 -0800
@@ -0,0 +1,3 @@
+include ../../../mk/objective.mk
+
+SUBDIRS = libtimidity src
--- a/Plugins/Input/timidity/libtimidity/Makefile.am	Thu Feb 02 18:33:24 2006 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-noinst_LTLIBRARIES = libtimidity.la
-
-libtimidity_la_SOURCES = \
-	common.c \
-	common.h \
-	dls1.h \
-	dls2.h \
-	instrum.c \
-	instrum_dls.c \
-	instrum_dls.h \
-	instrum.h \
-	mix.c \
-	mix.h \
-	options.h \
-	output.c \
-	output.h \
-	playmidi.c \
-	playmidi.h \
-	readmidi.c \
-	readmidi.h \
-	resample.c \
-	resample.h \
-	stream.c \
-	tables.c \
-	tables.h \
-	timidity.c \
-	timidity.h \
-	timidity_internal.h
-
-INCLUDES = $(GTK_CFLAGS) -I$(top_builddir)/intl -I$(top_srcdir)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Plugins/Input/timidity/libtimidity/Makefile.in	Thu Feb 02 18:47:47 2006 -0800
@@ -0,0 +1,22 @@
+include ../../../../mk/rules.mk
+include ../../../../mk/objective.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 += -fPIC -DPIC $(GTK_CFLAGS) -I../../../../intl -I../../../..
+
+OBJECTS = ${SOURCES:.c=.o}
--- a/Plugins/Input/timidity/src/Makefile.am	Thu Feb 02 18:33:24 2006 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-lib_LTLIBRARIES = libtimidity.la
-
-libdir = $(plugindir)/$(INPUT_PLUGIN_DIR)
-
-libtimidity_la_LDFLAGS = $(PLUGIN_LDFLAGS) ../libtimidity/libtimidity.la
-
-libtimidity_la_SOURCES = \
-	callbacks.c \
-	callbacks.h \
-	interface.c \
-	interface.h \
-	xmms-timidity.c \
-	xmms-timidity.h
-
-INCLUDES = $(GTK_CFLAGS) -I$(top_builddir)/intl -I$(top_srcdir) -I../libtimidity
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Plugins/Input/timidity/src/Makefile.in	Thu Feb 02 18:47:47 2006 -0800
@@ -0,0 +1,18 @@
+include ../../../../mk/rules.mk
+include ../../../../mk/objective.mk
+
+OBJECTIVE_LIBS = libtimidity.so
+
+LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
+
+LIBADD = ../libtimidity/libtimidity.a
+
+SOURCES = \
+	callbacks.c \
+	interface.c \
+	xmms-timidity.c \
+
+OBJECTS = ${SOURCES:.c=.o}
+
+CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../../intl -I../../../.. \ 
+	-I../libtimidity