Mercurial > audlegacy-plugins

changeset 1789:de1511c4ab19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
esd: Mk2
author William Pitcock <nenolod@atheme.org>
date Mon, 24 Sep 2007 12:22:43 -0500
parents da78a435e90e
children ea7ec02f2ea2
files src/esd/Makefile src/esd/esdout.h
diffstat 2 files changed, 9 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/esd/Makefile	Mon Sep 24 12:20:50 2007 -0500
+++ b/src/esd/Makefile	Mon Sep 24 12:22:43 2007 -0500
@@ -1,18 +1,15 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
+include ../../extra.mk
 
-OBJECTIVE_LIBS = libESD$(SHARED_SUFFIX)
+PLUGIN = ESD$(PLUGIN_SUFFIX)
+plugindir = audacious/$(OUTPUT_PLUGIN_DIR)
 
-noinst_HEADERS = esdout.h
+SRCS = esd.c mixer.c about.c configure.c audio.c init.c
 
-LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
+include ../../buildsys.mk
 
-LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(ESD_LIBS) $(OSS_LIBS)
-SOURCES = esd.c mixer.c about.c configure.c audio.c init.c
+LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(ESD_LIBS) $(OSS_LIBS)
 
-OBJECTS = ${SOURCES:.c=.o}
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ESD_CFLAGS) \
+CFLAGS += $(PLUGIN_CFLAGS)
+CPPFLAGS += $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ESD_CFLAGS) \
 	-I../../intl -I../.. -I..
 
-include ../../mk/objective.mk
--- a/src/esd/esdout.h	Mon Sep 24 12:20:50 2007 -0500
+++ b/src/esd/esdout.h	Mon Sep 24 12:22:43 2007 -0500
@@ -22,9 +22,7 @@
 #ifndef ESDOUT_H
 #define ESDOUT_H
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
+#include "config.h"
 
 #include <glib.h>