# HG changeset patch # User William Pitcock # Date 1190841521 18000 # Node ID 5af55c925d6eaebe990bfad2c5947d3265151ece # Parent 95685713a865b9b73c80f17307f5438fffc4651c amidi-plug: partial transition to new build system diff -r 95685713a865 -r 5af55c925d6e src/amidi-plug/Makefile --- a/src/amidi-plug/Makefile Wed Sep 26 16:13:38 2007 -0500 +++ b/src/amidi-plug/Makefile Wed Sep 26 16:18:41 2007 -0500 @@ -1,7 +1,4 @@ -include ../../mk/rules.mk -include ../../mk/init.mk - -OBJECTIVE_LIBS = libamidi-plug$(SHARED_SUFFIX) +PLUGIN = amidi-plug$(PLUGIN_SUFFIX) SUBDIRS = pcfg $(AMIDIPLUG_BACKENDS) noinst_HEADERS = amidi-plug.h i_backend.h i_midi.h i_midievent.h \ @@ -12,19 +9,22 @@ amidi-plug-icon.xpm amidi-plug.logo.xpm \ amidi-plug.midiicon.xpm -LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) +plugindir = audacious/$(INPUT_PLUGIN_DIR) -LIBADD = $(GTK_LIBS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(GMODULE_LIBS) -lpthread ./pcfg/libpcfg.a -SOURCES = amidi-plug.c i_vfslayer.c i_midi.c i_backend.c \ +SRCS = amidi-plug.c i_vfslayer.c i_midi.c i_backend.c \ i_configure.c i_configure-ap.c i_configure-alsa.c \ i_configure-fluidsynth.c i_configure-dummy.c \ i_utils.c i_fileinfo.c +include ../../buildsys.mk +include ../../extra.mk + OBJECTS = ${SOURCES:.c=.o} -LIBDEP = ./pcfg/libpcfg.a +EXT_DEPS = ./pcfg/libpcfg.a -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(GMODULE_CFLAGS) -DAMIDIPLUGBACKENDDIR=\"$(AMIDIPLUGBACKENDDIR)\" \ - -I../../intl -I../.. +CFLAGS += $(PLUGIN_CFLAGS) +CPPFLAGS += $(PLUGIN_CPPFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(GMODULE_CFLAGS) $(MOWGLI_CFLAGS) \ + -DAMIDIPLUGBACKENDDIR=\"$(AMIDIPLUGBACKENDDIR)\" -I../../intl -I../.. -include ../../mk/objective.mk +LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(GMODULE_LIBS) -lpthread ./pcfg/libpcfg.a diff -r 95685713a865 -r 5af55c925d6e src/amidi-plug/pcfg/Makefile --- a/src/amidi-plug/pcfg/Makefile Wed Sep 26 16:13:38 2007 -0500 +++ b/src/amidi-plug/pcfg/Makefile Wed Sep 26 16:18:41 2007 -0500 @@ -1,14 +1,12 @@ -include ../../../mk/rules.mk -include ../../../mk/init.mk +SRCS = i_pcfg.c + +STATIC_LIB_NOINST = libpcfg.a + +include ../../../buildsys.mk +include ../../../extra.mk noinst_HEADERS = i_pcfg.h -CFLAGS += $(PICFLAGS) $(GLIB_CFLAGS) -I../../.. - -OBJECTIVE_LIBS_NOINST = libpcfg.a +CFLAGS += $(PLUGIN_CFLAGS) +CPPFLAGS += $(PLUGIN_CPPFLAGS) $(GLIB_CFLAGS) -I../../.. -SOURCES = i_pcfg.c - -OBJECTS = ${SOURCES:.c=.o} - -include ../../../mk/objective.mk