# HG changeset patch # User Eugene Paskevich # Date 1191958772 -10800 # Node ID e2904348f1543d4ff0f5a8ffa5a7533831b8cf52 # Parent 5abb9030e8a721b583515abbb85cb5336a145b95 Converted amidi-plug backends to the new build system. diff -r 5abb9030e8a7 -r e2904348f154 configure.ac --- a/configure.ac Tue Oct 09 16:58:35 2007 +0300 +++ b/configure.ac Tue Oct 09 22:39:32 2007 +0300 @@ -1063,8 +1063,8 @@ INPUT_PLUGINS="$INPUT_PLUGINS amidi-plug" PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.6.0],,) PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.6.0],,) - AMIDIPLUGBACKENDDIR=${libdir}/audacious/amidi-plug - AC_SUBST(AMIDIPLUGBACKENDDIR) + AMIDIPLUG_BACKEND_DIR=amidi-plug + AC_SUBST(AMIDIPLUG_BACKEND_DIR) if test "x$enable_amidiplug_alsa" = "xauto" -o "x$enable_amidiplug_alsa" = "xyes"; then if test "x$alsalib_available" = "xcheck"; then PKG_CHECK_MODULES(ALSA, [alsa >= 1.0], diff -r 5abb9030e8a7 -r e2904348f154 extra.mk.in --- a/extra.mk.in Tue Oct 09 16:58:35 2007 +0300 +++ b/extra.mk.in Tue Oct 09 22:39:32 2007 +0300 @@ -62,7 +62,7 @@ ALSA_LIBS ?= @ALSA_LIBS@ AMDEP_FALSE ?= @AMDEP_FALSE@ AMDEP_TRUE ?= @AMDEP_TRUE@ -AMIDIPLUGBACKENDDIR ?= @AMIDIPLUGBACKENDDIR@ +AMIDIPLUG_BACKEND_DIR ?= @AMIDIPLUG_BACKEND_DIR@ AMIDIPLUG_BACKENDS ?= @AMIDIPLUG_BACKENDS@ AMTAR ?= @AMTAR@ AR ?= @AR@ diff -r 5abb9030e8a7 -r e2904348f154 src/amidi-plug/Makefile --- a/src/amidi-plug/Makefile Tue Oct 09 16:58:35 2007 +0300 +++ b/src/amidi-plug/Makefile Tue Oct 09 22:39:32 2007 +0300 @@ -25,6 +25,6 @@ CFLAGS += $(PLUGIN_CFLAGS) CPPFLAGS += $(PLUGIN_CPPFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(GMODULE_CFLAGS) $(MOWGLI_CFLAGS) \ - -DAMIDIPLUGBACKENDDIR=\"$(AMIDIPLUGBACKENDDIR)\" -I../../intl -I../.. + -DAMIDIPLUGBACKENDDIR=\"$(libdir)/audacious/$(AMIDIPLUG_BACKEND_DIR)\" -I../../intl -I../.. LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(GMODULE_LIBS) -lpthread ./pcfg/libpcfg.a diff -r 5abb9030e8a7 -r e2904348f154 src/amidi-plug/backend-alsa/Makefile --- a/src/amidi-plug/backend-alsa/Makefile Tue Oct 09 16:58:35 2007 +0300 +++ b/src/amidi-plug/backend-alsa/Makefile Tue Oct 09 22:39:32 2007 +0300 @@ -1,19 +1,13 @@ -include ../../../mk/rules.mk -include ../../../mk/init.mk +PLUGIN = ap-alsa$(PLUGIN_SUFFIX) +plugindir = audacious/$(AMIDIPLUG_BACKEND_DIR) noinst_HEADERS = b-alsa.h b-alsa-config.h backend-alsa-icon.xpm -CFLAGS += $(PICFLAGS) $(GLIB_CFLAGS) $(ALSA_CFLAGS) -I../../.. - -libdir = $(AMIDIPLUGBACKENDDIR) - -OBJECTIVE_LIBS = ap-alsa$(SHARED_SUFFIX) +SRCS = b-alsa.c -LIBADD = $(GLIB_LIBS) $(ALSA_LIBS) ../pcfg/libpcfg.a -SOURCES = b-alsa.c +include ../../../buildsys.mk +include ../../../extra.mk -OBJECTS = ${SOURCES:.c=.o} - -LIBDEP = ../pcfg/libpcfg.a - -include ../../../mk/objective.mk +CFLAGS += $(PLUGIN_CFLAGS) $(ALSA_CFLAGS) +CPPFLAGS += $(PLUGIN_CPPFLAGS) $(ALSA_CFLAGS) $(GLIB_CFLAGS) -I../../.. +LIBS += $(ALSA_LIBS) ../pcfg/libpcfg.a diff -r 5abb9030e8a7 -r e2904348f154 src/amidi-plug/backend-dummy/Makefile --- a/src/amidi-plug/backend-dummy/Makefile Tue Oct 09 16:58:35 2007 +0300 +++ b/src/amidi-plug/backend-dummy/Makefile Tue Oct 09 22:39:32 2007 +0300 @@ -1,19 +1,13 @@ -include ../../../mk/rules.mk -include ../../../mk/init.mk +PLUGIN = ap-dummy$(PLUGIN_SUFFIX) +plugindir = audacious/$(AMIDIPLUG_BACKEND_DIR) noinst_HEADERS = b-dummy.h b-dummy-config.h backend-dummy-icon.xpm -CFLAGS += $(PICFLAGS) $(GLIB_CFLAGS) -I../../.. - -libdir = $(AMIDIPLUGBACKENDDIR) - -OBJECTIVE_LIBS = ap-dummy$(SHARED_SUFFIX) +SRCS = b-dummy.c -LIBADD = $(GLIB_LIBS) ../pcfg/libpcfg.a -SOURCES = b-dummy.c +include ../../../buildsys.mk +include ../../../extra.mk -OBJECTS = ${SOURCES:.c=.o} - -LIBDEP = ../pcfg/libpcfg.a - -include ../../../mk/objective.mk +CFLAGS += $(PLUGIN_CFLAGS) +CPPFLAGS += $(PLUGIN_CPPFLAGS) $(GLIB_CFLAGS) -I../../.. +LIBS += ../pcfg/libpcfg.a diff -r 5abb9030e8a7 -r e2904348f154 src/amidi-plug/backend-fluidsynth/Makefile --- a/src/amidi-plug/backend-fluidsynth/Makefile Tue Oct 09 16:58:35 2007 +0300 +++ b/src/amidi-plug/backend-fluidsynth/Makefile Tue Oct 09 22:39:32 2007 +0300 @@ -1,19 +1,13 @@ -include ../../../mk/rules.mk -include ../../../mk/init.mk +PLUGIN = ap-fluidsynth$(PLUGIN_SUFFIX) +plugindir = audacious/$(AMIDIPLUG_BACKEND_DIR) noinst_HEADERS = b-fluidsynth.h b-fluidsynth-config.h backend-fluidsynth-icon.xpm -CFLAGS += $(PICFLAGS) $(GLIB_CFLAGS) $(FLUIDSYNTH_CFLAGS) -I../../.. - -libdir = $(AMIDIPLUGBACKENDDIR) - -OBJECTIVE_LIBS = ap-fluidsynth$(SHARED_SUFFIX) +SRCS = b-fluidsynth.c -LIBADD = -lm $(GLIB_LIBS) $(FLUIDSYNTH_LIBS) ../pcfg/libpcfg.a -SOURCES = b-fluidsynth.c +include ../../../buildsys.mk +include ../../../extra.mk -OBJECTS = ${SOURCES:.c=.o} - -LIBDEP = ../pcfg/libpcfg.a - -include ../../../mk/objective.mk +CFLAGS += $(PLUGIN_CFLAGS) $(FLUIDSYNTH_CFLAGS) +CPPFLAGS += $(PLUGIN_CPPFLAGS) $(FLUIDSYNTH_CFLAGS) $(GLIB_CFLAGS) -I../../.. +LIBS += $(FLUIDSYNTH_LIBS) ../pcfg/libpcfg.a