Mercurial > audlegacy-plugins
changeset 1785:d447ee6c8bc0
timidity: Mk2
| author | William Pitcock <nenolod@atheme.org> |
|---|---|
| date | Mon, 24 Sep 2007 12:06:17 -0500 |
| parents | add71276abfc |
| children | 5a7c84857361 |
| files | src/timidity/Makefile src/timidity/libtimidity/Makefile src/timidity/src/Makefile src/timidity/src/callbacks.c src/timidity/src/interface.c src/timidity/src/xmms-timidity.c |
| diffstat | 6 files changed, 17 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/src/timidity/Makefile Mon Sep 24 12:02:14 2007 -0500 +++ b/src/timidity/Makefile Mon Sep 24 12:06:17 2007 -0500 @@ -1,6 +1,3 @@ -include ../../mk/rules.mk -include ../../mk/init.mk +include ../../buildsys.mk SUBDIRS = libtimidity src - -include ../../mk/objective.mk
--- a/src/timidity/libtimidity/Makefile Mon Sep 24 12:02:14 2007 -0500 +++ b/src/timidity/libtimidity/Makefile Mon Sep 24 12:06:17 2007 -0500 @@ -1,9 +1,8 @@ -include ../../../mk/rules.mk -include ../../../mk/init.mk +include ../../../extra.mk -OBJECTIVE_LIBS_NOINST = libtimidity.a +STATIC_LIB_NOINST = libtimidity.a -SOURCES = \ +SRCS = \ common.c \ instrum.c \ instrum_dls.c \ @@ -16,8 +15,7 @@ tables.c \ timidity.c -CFLAGS += $(PICFLAGS) -I../../.. +include ../../../buildsys.mk -OBJECTS = ${SOURCES:.c=.o} - -include ../../../mk/objective.mk +CFLAGS += $(PLUGIN_CFLAGS) +CPPFLAGS += -I../../.. $(GLIB_CFLAGS)
--- a/src/timidity/src/Makefile Mon Sep 24 12:02:14 2007 -0500 +++ b/src/timidity/src/Makefile Mon Sep 24 12:06:17 2007 -0500 @@ -1,21 +1,17 @@ -include ../../../mk/rules.mk -include ../../../mk/init.mk - -OBJECTIVE_LIBS = libtimidity$(SHARED_SUFFIX) +include ../../../extra.mk -LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) +PLUGIN = timidity$(PLUGIN_SUFFIX) +plugindir = audacious/$(INPUT_PLUGIN_DIR) -LIBADD = ../libtimidity/libtimidity.a $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) - -SOURCES = \ +SRCS = \ callbacks.c \ interface.c \ xmms-timidity.c \ -OBJECTS = ${SOURCES:.c=.o} - LIBDEP = ../libtimidity/libtimidity.a -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../.. -I../libtimidity +include ../../../buildsys.mk -include ../../../mk/objective.mk +LIBS += ../libtimidity/libtimidity.a $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) +CFLAGS += $(PLUGIN_CFLAGS) +CPPFLAGS += $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../.. -I../libtimidity
--- a/src/timidity/src/callbacks.c Mon Sep 24 12:02:14 2007 -0500 +++ b/src/timidity/src/callbacks.c Mon Sep 24 12:06:17 2007 -0500 @@ -1,6 +1,4 @@ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <gtk/gtk.h>
--- a/src/timidity/src/interface.c Mon Sep 24 12:02:14 2007 -0500 +++ b/src/timidity/src/interface.c Mon Sep 24 12:06:17 2007 -0500 @@ -2,9 +2,7 @@ * DO NOT EDIT THIS FILE - it is generated by Glade. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <sys/types.h> #include <sys/stat.h>
--- a/src/timidity/src/xmms-timidity.c Mon Sep 24 12:02:14 2007 -0500 +++ b/src/timidity/src/xmms-timidity.c Mon Sep 24 12:06:17 2007 -0500 @@ -17,9 +17,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifdef HAVE_CONFIG_H #include <config.h> -#endif #include "audacious/util.h" #include "audacious/configdb.h"