changeset 2768:4a5cdf975bb3 trunk

[svn] Added a hook when building dependencies so that the dbus-bindings are created first without producing any error messages.
author magma
date Sun, 13 May 2007 11:57:18 -0700
parents 55dc022c405a
children bf2d80abf76e
files ChangeLog mk/objective.mk src/Makefile src/audacious/Makefile src/audacious/build_stamp.c
diffstat 5 files changed, 17 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun May 13 11:56:01 2007 -0700
+++ b/ChangeLog	Sun May 13 11:57:18 2007 -0700
@@ -1,3 +1,12 @@
+2007-05-13 18:56:01 +0000  Ben Tucker <bnt@interchange.ubc.ca>
+  revision [4560]
+  Changed signedness and formatting.
+  
+  trunk/src/libaudclient/audctrl.c |   30 +++++++++++++++---------------
+  trunk/src/libaudclient/audctrl.h |   26 +++++++++++++-------------
+  2 files changed, 28 insertions(+), 28 deletions(-)
+
+
 2007-05-13 09:31:11 +0000  Ben Tucker <bnt@interchange.ubc.ca>
   revision [4558]
   Added CMD_GET_INFO and CMD_PLAYLIST_GET_TUPLE_DATA replacements; Changed some formatting and used unsigned numbers where appropriate.
--- a/mk/objective.mk	Sun May 13 11:56:01 2007 -0700
+++ b/mk/objective.mk	Sun May 13 11:57:18 2007 -0700
@@ -251,11 +251,13 @@
 		echo "[complete]"; \
 	fi
 
-.PHONY: .depend depend clean distclean
+.PHONY: .depend depend depend-prehook clean distclean
 .depend:
+depend-prehook:
 
 # default depend rule. if something else is needed -- override depend target
 depend:
+	$(MAKE) depend-prehook
 	@if [ "x$(SUBDIRS)" != "x" ]; then \
 		for i in $(SUBDIRS); do \
 			if [ $(VERBOSITY) -gt 0 ]; then \
--- a/src/Makefile	Sun May 13 11:56:01 2007 -0700
+++ b/src/Makefile	Sun May 13 11:57:18 2007 -0700
@@ -7,3 +7,6 @@
 
 include ../mk/objective.mk
 
+depend-prehook:
+	@cd audacious; $(MAKE) $@ || exit; cd ..;
+
--- a/src/audacious/Makefile	Sun May 13 11:56:01 2007 -0700
+++ b/src/audacious/Makefile	Sun May 13 11:57:18 2007 -0700
@@ -130,7 +130,7 @@
 desktop_DATA = audacious.desktop
 desktopdir = $(datadir)/applications
 
-depend: $(DBUS_BINDINGS)
+depend-prehook: $(DBUS_BINDINGS)
 
 audacious: $(OBJECTS) $(LIBDEP)
 	$(CXX) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@ 
--- a/src/audacious/build_stamp.c	Sun May 13 11:56:01 2007 -0700
+++ b/src/audacious/build_stamp.c	Sun May 13 11:57:18 2007 -0700
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070513-4558";
+const gchar *svn_stamp = "20070513-4560";