Mercurial > audlegacy-plugins
changeset 1791:ea7ec02f2ea2
Automated merge with ssh://hg.atheme-project.org//hg/audacious-plugins
| author | Jonathan Schleifer <js@h3c.de> |
|---|---|
| date | Mon, 24 Sep 2007 19:19:59 +0200 |
| parents | 2d37dbee0d12 (current diff) de1511c4ab19 (diff) |
| children | cbe54a147f12 |
| files | |
| diffstat | 3 files changed, 17 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/src/esd/Makefile Mon Sep 24 19:19:41 2007 +0200 +++ b/src/esd/Makefile Mon Sep 24 19:19:59 2007 +0200 @@ -1,18 +1,15 @@ -include ../../mk/rules.mk -include ../../mk/init.mk +include ../../extra.mk -OBJECTIVE_LIBS = libESD$(SHARED_SUFFIX) +PLUGIN = ESD$(PLUGIN_SUFFIX) +plugindir = audacious/$(OUTPUT_PLUGIN_DIR) -noinst_HEADERS = esdout.h +SRCS = esd.c mixer.c about.c configure.c audio.c init.c -LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR) +include ../../buildsys.mk -LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(ESD_LIBS) $(OSS_LIBS) -SOURCES = esd.c mixer.c about.c configure.c audio.c init.c +LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(ESD_LIBS) $(OSS_LIBS) -OBJECTS = ${SOURCES:.c=.o} - -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ESD_CFLAGS) \ +CFLAGS += $(PLUGIN_CFLAGS) +CPPFLAGS += $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ESD_CFLAGS) \ -I../../intl -I../.. -I.. -include ../../mk/objective.mk
--- a/src/esd/esdout.h Mon Sep 24 19:19:41 2007 +0200 +++ b/src/esd/esdout.h Mon Sep 24 19:19:59 2007 +0200 @@ -22,9 +22,7 @@ #ifndef ESDOUT_H #define ESDOUT_H -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h>
--- a/src/null/Makefile Mon Sep 24 19:19:41 2007 +0200 +++ b/src/null/Makefile Mon Sep 24 19:19:59 2007 +0200 @@ -1,15 +1,13 @@ -include ../../mk/rules.mk -include ../../mk/init.mk +include ../../extra.mk -OBJECTIVE_LIBS = libnull${SHARED_SUFFIX} +PLUGIN = null${PLUGIN_SUFFIX} +plugindir = audacious/${OUTPUT_PLUGIN_DIR} -LIBDIR = ${plugindir}/${OUTPUT_PLUGIN_DIR} +SRCS = null.c -SOURCES = null.c - -OBJECTS = ${SOURCES:.c=.o} +include ../../buildsys.mk -CFLAGS += ${PICFLAGS} \ - -I../.. +CFLAGS += ${PLUGIN_CFLAGS} +CPPFLAGS += ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${DBUS_CFLAGS} ${MOWGLI_CFLAGS} -I../.. +LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} -include ../../mk/objective.mk