changeset 1806:ec6c92d79a16

Automated merge with ssh://hg.atheme-project.org//hg/audacious-plugins
author Jonathan Schleifer <js@h3c.de>
date Mon, 24 Sep 2007 19:51:27 +0200
parents 306fc97f2cce (current diff) fe62b69ceb90 (diff)
children 562e7f9bb661
files
diffstat 1 files changed, 8 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/alsa/Makefile	Mon Sep 24 19:51:17 2007 +0200
+++ b/src/alsa/Makefile	Mon Sep 24 19:51:27 2007 +0200
@@ -1,18 +1,14 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
+include ../../extra.mk
 
-OBJECTIVE_LIBS = libALSA$(SHARED_SUFFIX)
+PLUGIN = ALSA$(SHARED_SUFFIX)
+plugindir = audacious/$(OUTPUT_PLUGIN_DIR)
 
-noinst_HEADERS = alsa.h
-
-LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
+SRCS = alsa.c about.c audio.c configure.c init.c
 
-LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(ALSA_LIBS) -lpthread
-SOURCES = alsa.c about.c audio.c configure.c init.c
-
-OBJECTS = ${SOURCES:.c=.o}
+include ../../buildsys.mk
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ALSA_CFLAGS) \
+CFLAGS += $(PLUGIN_CFLAGS)
+CPPFLAGS += $(PLUGIN_CPPFLAGS) $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ALSA_CFLAGS) \
 	-I../../intl -I../..
+LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(ALSA_LIBS)
 
-include ../../mk/objective.mk