changeset 1795:c66d632520d1

scrobbler: Mk2
author William Pitcock <nenolod@atheme.org>
date Mon, 24 Sep 2007 12:33:34 -0500
parents a895337fbc2f
children 8fee3d70029a ef7894bd0c22
files src/scrobbler/Makefile src/scrobbler/audioscrobbler.png src/scrobbler/audioscrobbler_badge.png src/scrobbler/images/audioscrobbler.png src/scrobbler/images/audioscrobbler_badge.png
diffstat 5 files changed, 13 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/src/scrobbler/Makefile	Mon Sep 24 12:28:55 2007 -0500
+++ b/src/scrobbler/Makefile	Mon Sep 24 12:33:34 2007 -0500
@@ -1,20 +1,11 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
-
-SUBDIRS = 
-
-OBJECTIVE_LIBS = libscrobbler$(SHARED_SUFFIX)
-
-imagesdir = $(datadir)/audacious/images
+include ../../extra.mk
 
-OBJECTIVE_DATA = audioscrobbler.png:$(imagesdir)	\
-	   audioscrobbler_badge.png:$(imagesdir)
+PLUGIN = scrobbler$(SHARED_SUFFIX)
+plugindir = audacious/$(GENERAL_PLUGIN_DIR)
 
-LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR)
+DATA = images/audioscrobbler.png images/audioscrobbler_badge.png
 
-LIBADD += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(CURL_LIBS) $(MUSICBRAINZ_LIBS)
-
-SOURCES = 			\
+SRCS = 			\
 	fmt.c			\
 	configure.c		\
 	gtkstuff.c		\
@@ -23,8 +14,13 @@
 	gerpok.c		\
 	plugin.c
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(BEEP_DEFINES) $(CURL_CFLAGS) -I../../intl -I../.. -Wall
+include ../../buildsys.mk
+
+# XXX: used to get install paths right
+PACKAGE = audacious
 
-OBJECTS = ${SOURCES:.c=.o}
+CFLAGS += $(PLUGIN_CFLAGS)
+CPPFLAGS += $(PLUGIN_CPPFLAGS) $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(BEEP_DEFINES) $(CURL_CFLAGS) \
+	-I../../intl -I../..
+LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(CURL_LIBS) $(MUSICBRAINZ_LIBS)
 
-include ../../mk/objective.mk
Binary file src/scrobbler/audioscrobbler.png has changed
Binary file src/scrobbler/audioscrobbler_badge.png has changed
Binary file src/scrobbler/images/audioscrobbler.png has changed
Binary file src/scrobbler/images/audioscrobbler_badge.png has changed