Mercurial > audlegacy-plugins
changeset 1851:224ae16453ef
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
| author | William Pitcock <nenolod@atheme.org> |
|---|---|
| date | Mon, 24 Sep 2007 14:19:48 -0500 |
| parents | e0f6efc6b08c (current diff) 67f2286e2f12 (diff) |
| children | a8667b6b6cd8 |
| files | |
| diffstat | 2 files changed, 14 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/buildsys.mk.in Mon Sep 24 14:19:35 2007 -0500 +++ b/buildsys.mk.in Mon Sep 24 14:19:48 2007 -0500 @@ -76,7 +76,7 @@ all: for i in subdirs depend ${OBJS} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${LIB} ${LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST}; do \ - ${MAKE} ${MFLAGS} $$i; \ + ${MAKE} ${MFLAGS} $$i || exit 1; \ done subdirs:
--- a/src/rootvis/Makefile Mon Sep 24 14:19:35 2007 -0500 +++ b/src/rootvis/Makefile Mon Sep 24 14:19:48 2007 -0500 @@ -1,22 +1,16 @@ -include ../../mk/rules.mk -include ../../mk/init.mk - -OBJECTIVE_LIBS = librootvis.so - -CFLAGS += -I. $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(IMLIB2_CFLAGS) - -LIBDIR = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR) - -LIBADD += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(IMLIB2_LIBS) +PLUGIN = rootvis${PLUGIN_SUFFIX} +SRCS = config_backend.c \ + config_definition.c \ + config_frontend.c \ + config_frontend_widgets.c \ + getroot.c \ + rootvis.c -SOURCES = \ - config_backend.c \ - config_definition.c \ - config_frontend.c \ - config_frontend_widgets.c \ - getroot.c \ - rootvis.c +plugindir = audacious/${VISUALIZATION_PLUGIN_DIR} -OBJECTS = ${SOURCES:.c=.o} +include ../../buildsys.mk +include ../../extra.mk -include ../../mk/objective.mk +CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} -I. ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${IMLIB2_CFLAGS} +CFLAGS += ${PLUGIN_CFLAGS} +LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${IMLIB2_LIBS}