Mercurial > audlegacy-plugins
changeset 1802:877a36a055a3
Automated merge with ssh://hg.atheme-project.org//hg/audacious-plugins
| author | Jonathan Schleifer <js@h3c.de> |
|---|---|
| date | Mon, 24 Sep 2007 19:46:00 +0200 |
| parents | 7086be3a058d (current diff) a93462deb026 (diff) |
| children | fe62b69ceb90 306fc97f2cce |
| files | |
| diffstat | 3 files changed, 18 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/src/OSS/Makefile Mon Sep 24 19:45:49 2007 +0200 +++ b/src/OSS/Makefile Mon Sep 24 19:46:00 2007 +0200 @@ -1,17 +1,13 @@ -include ../../mk/rules.mk -include ../../mk/init.mk +include ../../extra.mk -OBJECTIVE_LIBS = libOSS$(SHARED_SUFFIX) +PLUGIN = OSS$(SHARED_SUFFIX) +plugindir = audacious/$(OUTPUT_PLUGIN_DIR) -noinst_HEADERS = OSS.h soundcard.h - -LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR) +SRCS = OSS.c mixer.c about.c configure.c audio.c init.c convert.c -LIBADD = $(OSS_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) -SOURCES = OSS.c mixer.c about.c configure.c audio.c init.c convert.c +include ../../buildsys.mk -OBJECTS = ${SOURCES:.c=.o} +LIBS += $(OSS_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) +CFLAGS += $(PLUGIN_CFLAGS) +CPPFLAGS += $(PLUGIN_CPPFLAGS) $(MOWGLI_CFLAGS) $(OSS_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../.. -I. -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../.. - -include ../../mk/objective.mk
--- a/src/OSS/OSS.h Mon Sep 24 19:45:49 2007 +0200 +++ b/src/OSS/OSS.h Mon Sep 24 19:46:00 2007 +0200 @@ -22,9 +22,7 @@ #ifndef OSS_H #define OSS_H -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h>
--- a/src/filewriter/Makefile Mon Sep 24 19:45:49 2007 +0200 +++ b/src/filewriter/Makefile Mon Sep 24 19:46:00 2007 +0200 @@ -1,15 +1,12 @@ -include ../../mk/rules.mk -include ../../mk/init.mk +include ../../extra.mk -OBJECTIVE_LIBS = libfilewriter$(SHARED_SUFFIX) - -LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR) +PLUGIN = filewriter$(SHARED_SUFFIX) +plugindir = audacious/$(OUTPUT_PLUGIN_DIR) -LIBADD = $(GTK_LIBS) ${FILEWRITER_LIBS} -SOURCES = filewriter.c wav.c mp3.c vorbis.c flac.c +SRCS = filewriter.c wav.c mp3.c vorbis.c flac.c + +include ../../buildsys.mk -OBJECTS = ${SOURCES:.c=.o} - -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. -Wall - -include ../../mk/objective.mk +CFLAGS += $(PLUGIN_CFLAGS) +CPPFLAGS += $(PLUGIN_CPPFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(PANGO_CFLAGS) $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) -I../../intl -I../.. -Wall +LIBS += $(GTK_LIBS) ${FILEWRITER_LIBS}