# HG changeset patch # User William Pitcock # Date 1190656050 18000 # Node ID cae98a7eef82e7442f0c9d5093b5b5efa7d41887 # Parent ef7894bd0c224644bba6e1803b7352b71878bb25 OSS: Mk2 diff -r ef7894bd0c22 -r cae98a7eef82 src/OSS/Makefile --- a/src/OSS/Makefile Mon Sep 24 12:36:53 2007 -0500 +++ b/src/OSS/Makefile Mon Sep 24 12:47:30 2007 -0500 @@ -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 diff -r ef7894bd0c22 -r cae98a7eef82 src/OSS/OSS.h --- a/src/OSS/OSS.h Mon Sep 24 12:36:53 2007 -0500 +++ b/src/OSS/OSS.h Mon Sep 24 12:47:30 2007 -0500 @@ -22,9 +22,7 @@ #ifndef OSS_H #define OSS_H -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include