banshee r4486 - in trunk/banshee: . build libbanshee src/Backends/Banshee.NowPlaying.X11/libbnpx11

[blorentz svn gnome org]

Author: blorentz
Date: Mon Sep  8 11:31:05 2008
New Revision: 4486
URL: http://svn.gnome.org/viewvc/banshee?rev=4486&view=rev

Log:
2008-09-08  Bertrand Lorentz  <bertrand lorentz gmail com>

	* src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.am:
	* libbanshee/Makefile.am:
	* build/build.rules.mk: Some build fixes to allow parallel build with
	"make -j2" (BGO #546944).



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/build/build.rules.mk
   trunk/banshee/libbanshee/Makefile.am
   trunk/banshee/src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.am

Modified: trunk/banshee/build/build.rules.mk
==============================================================================
--- trunk/banshee/build/build.rules.mk	(original)
+++ trunk/banshee/build/build.rules.mk	Mon Sep  8 11:31:05 2008
@@ -37,6 +37,8 @@
 build-debug:
 	@echo $(DEP_LINK)
 
+$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
+
 $(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
 	@mkdir -p $(top_builddir)/bin
 	@colors=no; \

Modified: trunk/banshee/libbanshee/Makefile.am
==============================================================================
--- trunk/banshee/libbanshee/Makefile.am	(original)
+++ trunk/banshee/libbanshee/Makefile.am	Mon Sep  8 11:31:05 2008
@@ -43,9 +43,9 @@
 
 all: $(top_builddir)/bin/libbanshee.so
 
-$(top_builddir)/bin/libbanshee.so: .libs/libbanshee.so	
+$(top_builddir)/bin/libbanshee.so: libbanshee.la
 	mkdir -p $(top_builddir)/bin
-	cp -f $< $@
+	cp -f .libs/libbanshee.so $@
 
 CLEANFILES = $(top_builddir)/bin/libbanshee.so
 MAINTAINERCLEANFILES = Makefile.in

Modified: trunk/banshee/src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.am
==============================================================================
--- trunk/banshee/src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.am	(original)
+++ trunk/banshee/src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.am	Mon Sep  8 11:31:05 2008
@@ -13,9 +13,9 @@
 
 all: $(top_builddir)/bin/libbnpx11.so
 
-$(top_builddir)/bin/libbnpx11.so: .libs/libbnpx11.so
+$(top_builddir)/bin/libbnpx11.so: libbnpx11.la
 	mkdir -p $(top_builddir)/bin
-	cp -f $< $@
+	cp -f .libs/libbnpx11.so $@
 
 CLEANFILES = $(top_builddir)/bin/libbnpx11.so