changeset 1799:cae98a7eef82

OSS: Mk2
author William Pitcock <nenolod@atheme.org>
date Mon, 24 Sep 2007 12:47:30 -0500
parents ef7894bd0c22
children a93462deb026
files src/OSS/Makefile src/OSS/OSS.h
diffstat 2 files changed, 9 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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 <glib.h>