diff src/audacious/Makefile @ 2771:4585019eb82e trunk

[svn] -Renamed MPRIS /TrackList Shuffle method to Random -Added stubs for the MPRIS /Player signals -Added stubs for the MPRIS /TrackList methods (implemented AddTrack) -Modified build system to be more ignorant of DBus support

--- a/src/audacious/Makefile	Mon May 14 01:10:54 2007 -0700
+++ b/src/audacious/Makefile	Tue May 15 21:53:37 2007 -0700
@@ -5,7 +5,6 @@
 SUBDIRS = widgets glade images ui
 
 OBJECTIVE_BINS = audacious
-OBJECTIVE_LIBS_NOINST = $(DBUS_BINDINGS)
 
 LDFLAGS += $(AUDLDFLAGS)
 
@@ -63,7 +62,6 @@
 	auddrct.c \
 	build_stamp.c \
 	configdb.c \
-	$(DBUS_C) \
 	dnd.c \
 	dock.c \
 	effect.c \
@@ -117,6 +115,13 @@
 	visualization.c \
 	xconvert.c
 
+ifdef USE_DBUS
+SOURCES += dbus.c
+DBUS_BINDINGS = dbus-server-bindings.h dbus-client-bindings.h
+depend-prehook: $(DBUS_BINDINGS)
+OBJECTIVE_LIBS_NOINST += $(DBUS_BINDINGS)
+endif
+
 DBUS_BINDINGS_SOURCES = \
 	objects.xml \
 	mpris_root.xml \
@@ -130,8 +135,6 @@
 desktop_DATA = audacious.desktop
 desktopdir = $(datadir)/applications
 
-depend-prehook: $(DBUS_BINDINGS)
-
 audacious: $(OBJECTS) $(LIBDEP)
 	$(CXX) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@ 
 	@printf "%10s     %-20s\n" LINK $@
@@ -139,7 +142,7 @@
 dbus-server-bindings.h: $(DBUS_BINDINGS_SOURCES)
 	$(DBUS_BINDING_TOOL) --mode=glib-server --prefix=audacious_rc objects.xml > $@
 	$(DBUS_BINDING_TOOL) --mode=glib-server --prefix=mpris_root mpris_root.xml >> $@
-	# $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=mpris_tracklist mpris_tracklist.xml >> $@
+	$(DBUS_BINDING_TOOL) --mode=glib-server --prefix=mpris_tracklist mpris_tracklist.xml >> $@
 	$(DBUS_BINDING_TOOL) --mode=glib-server --prefix=mpris_player mpris_player.xml >> $@
 	@printf "%10s     %-20s\n" DBUS-BIND $@