changeset 2007:57ee341c180f

Converted daap to the new buildsys. Even though it is not built currently. (???)

--- a/src/daap/Makefile	Wed Oct 10 01:40:13 2007 +0300
+++ b/src/daap/Makefile	Wed Oct 10 05:21:55 2007 +0300
@@ -1,32 +1,22 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
+PLUGIN = libdaap$(PLUGIN_SUFFIX)
 
-OBJECTIVE_LIBS = libdaap$(SHARED_SUFFIX)
+SRCS = daap.c
 
 SUBDIRS = xmms2-daap
 
-LIBDIR = $(plugindir)/$(TRANSPORT_PLUGIN_DIR)
+include ../../buildsys.mk
+include ../../extra.mk
+
+plugindir := $(plugindir)/$(TRANSPORT_PLUGIN_DIR)
 
 #For the moment i'm hardcoding it but it will be configurable
 #MDNS_LIBS=-ldns_sd
 MDNS_LIBS=-lavahi-glib -lavahi-common -lavahi-client
 #MDNS_LIBS= 
 
-
-
-
-LIBADD += ./xmms2-daap/xmms2-daap.a $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(MDNS_LIBS)
-
-SOURCES = daap.c
-
-OBJECTS = ${SOURCES:.c=.o}
+INC = -I../.. -I./xmms2-daap
+WARN = -Wall -pedantic -std=c99 
 
-LIBDEP = ./xmms2-daap/xmms2-daap.a
-
-INC = -I../.. -I./xmms2-daap
-
-WARN = -Wall  -pedantic -std=c99 
-
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(INC) $(WARN)  $(GCC42_CFLAGS)
-
-include ../../mk/objective.mk
+CFLAGS += $(PLUGIN_CFLAGS)
+CPPFLAGS += $(PLUGIN_CPPFLAGS) $(MOWGLI_CFLAGS) $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(INC) $(WARN) $(GCC42_CFLAGS)
+LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(MDNS_LIBS) ./xmms2-daap/xmms2-daap.a

--- a/src/daap/xmms2-daap/Makefile	Wed Oct 10 01:40:13 2007 +0300
+++ b/src/daap/xmms2-daap/Makefile	Wed Oct 10 05:21:55 2007 +0300
@@ -1,27 +1,26 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
-
-OBJECTIVE_LIBS_NOINST= xmms2-daap.a
+STATIC_LIB_NOINST = xmms2-daap.a
 
-SOURCES= cc_handlers.c \
-		 daap_conn.c \
-		 daap_cmd.c \
-		 daap_md5.c \
-		 daap_util.c \
-		 daap_mdns_dnssd.c \
-		 daap_mdns_avahi.c \
-		 daap_mdns_dummy.c 
+SRCS = cc_handlers.c	\
+       daap_conn.c	\
+       daap_cmd.c	\
+       daap_md5.c	\
+       daap_util.c	\
+       daap_mdns_dnssd.c \
+       daap_mdns_avahi.c \
+       daap_mdns_dummy.c
+#       daap_xform.c 
 
-#		 daap_xform.c 
-LIBADD = $(GLIB_LIBS) 
+include ../../../buildsys.mk
+include ../../../extra.mk
 
 #For the moment i'm hardcoding it but it will be configurable
 #MDNS_IMPL=DAAP_MDNS_DNSSD
 MDNS_IMPL=DAAP_MDNS_AVAHI
 #MDNS_IMPL=DAAP_MDNS_DUMMY 
 
-CFLAGS = $(GLIB_CFLAGS) $(PICFLAGS) -std=c99 -Wall -D_POSIX_SOURCE -D$(MDNS_IMPL) 
+WARN = -Wall -std=c99
+DEFINES = -D$(MDNS_IMPL) -D_POSIX_SOURCE
 
-OBJECTS=${SOURCES:.c=.o}
-
-include ../../../mk/objective.mk
+CFLAGS += $(PLUGIN_CFLAGS)
+CPPFLAGS += $(PLUGIN_CPPFLAGS) $(GLIB_CFLAGS) $(PICFLAGS) $(WARN) $(DEFINES)
+LIBS += $(GLIB_LIBS)