Mercurial > audlegacy-plugins

changeset 1791:ea7ec02f2ea2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 (diff) de1511c4ab19 (current diff)
children cbe54a147f12
files
diffstat 2 files changed, 14 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/src/OSS4/Makefile	Mon Sep 24 12:22:43 2007 -0500
+++ b/src/OSS4/Makefile	Mon Sep 24 19:19:59 2007 +0200
@@ -1,17 +1,16 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
-
-OBJECTIVE_LIBS = libOSS4$(SHARED_SUFFIX)
-
-noinst_HEADERS = OSS4.h soundcard.h
-
-LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
+PLUGIN = OSS4${PLUGIN_SUFFIX}
+SRCS = OSS4.c		\
+       about.c		\
+       configure.c	\
+       audio.c		\
+       init.c		\
+       convert.c
 
-LIBADD = $(OSS_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
-SOURCES = OSS4.c about.c configure.c audio.c init.c convert.c
+plugindir = audacious/${INPUT_PLUGIN_DIR}
 
-OBJECTS = ${SOURCES:.c=.o}
+include ../../buildsys.mk
+include ../../extra.mk
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I/usr/lib/oss/include -I../../intl -I../..
-
-include ../../mk/objective.mk
+CPPFLAGS += ${PLUGIN_CPPFLAGS} -I/usr/lib/oss/include -I../../intl -I../.. ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS}
+CFLAGS += ${PLUGIN_CFLAGS} -I/usr/lib/oss/include -I../../intl -I../.. ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS}
+LIBS += ${OSS_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
--- a/src/OSS4/OSS4.h	Mon Sep 24 12:22:43 2007 -0500
+++ b/src/OSS4/OSS4.h	Mon Sep 24 19:19:59 2007 +0200
@@ -22,9 +22,7 @@
 #ifndef OSS4_H
 #define OSS4_H
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
+#include "config.h"
 
 #ifdef HAVE_SYS_SOUNDCARD_H
 #include <sys/soundcard.h>