banshee r3056 - in trunk/banshee: . build libbanshee src src/Core

[abock svn gnome org]

Author: abock
Date: Sun Jan 27 06:51:58 2008
New Revision: 3056
URL: http://svn.gnome.org/viewvc/banshee?rev=3056&view=rev

Log:
Make make run work

Modified:
   trunk/banshee/Makefile.am
   trunk/banshee/build/build.rules.mk
   trunk/banshee/libbanshee/Makefile.am
   trunk/banshee/src/Core/Makefile.am
   trunk/banshee/src/Makefile.am

Modified: trunk/banshee/Makefile.am
==============================================================================
--- trunk/banshee/Makefile.am	(original)
+++ trunk/banshee/Makefile.am	Sun Jan 27 06:51:58 2008
@@ -45,10 +45,13 @@
 	mkinstalldirs
 
 run:
-	pushd $(top_builddir)/src/Core; \
-	make run; \
+	@pushd bin; \
+	$(MONO) Nereid.exe --debug --uninstalled $(BANSHEE_DEV_OPTIONS); \
 	popd;
 
+clean-local:
+	rm -rf $(top_builddir)/bin
+
 uninstall-hook:
 	if test `find $(pkglibdir) | wc -l` -eq 1; then \
 		rmdir $(pkglibdir); \

Modified: trunk/banshee/build/build.rules.mk
==============================================================================
--- trunk/banshee/build/build.rules.mk	(original)
+++ trunk/banshee/build/build.rules.mk	Sun Jan 27 06:51:58 2008
@@ -23,7 +23,7 @@
 
 $(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED_FULL)
 	@mkdir -p $(top_builddir)/bin
-	@echo "Compiling $(notdir $@)..."
+	@echo -e "\033[1mCompiling $(notdir $@)...\033[0m"
 	@$(BUILD) -target:$(TARGET) -out:$@ $(LINK) $(RESOURCES_BUILD) $(SOURCES_BUILD)
 
 EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED_FULL)

Modified: trunk/banshee/libbanshee/Makefile.am
==============================================================================
--- trunk/banshee/libbanshee/Makefile.am	(original)
+++ trunk/banshee/libbanshee/Makefile.am	Sun Jan 27 06:51:58 2008
@@ -32,6 +32,11 @@
 	$(GST_LIBS) \
 	$(LIBNAUTILUS_BURN_LIBS)
 
+all: 
+	@mkdir -p $(top_builddir)/bin
+	@cp $(builddir)/.libs/libbanshee.so $(top_builddir)/bin
+
+CLEANFILES = $(top_builddir)/bin/libbanshee.so
 MAINTAINERCLEANFILES = Makefile.in
 EXTRA_DIST = $(libbanshee_la_SOURCES)
 

Modified: trunk/banshee/src/Core/Makefile.am
==============================================================================
--- trunk/banshee/src/Core/Makefile.am	(original)
+++ trunk/banshee/src/Core/Makefile.am	Sun Jan 27 06:51:58 2008
@@ -7,25 +7,10 @@
 	Banshee.ThickClient \
 	Nereid
 
-include $(top_srcdir)/build/build.environment.mk
-
 run:
-	@rm -rf .run.tmp; \
-	mkdir -p .run.tmp/Addins; \
-	for dir in $(MONO_BASE_PATH); do \
-		cp $$dir/*.{dll,exe,mdb,config} .run.tmp/ 2>/dev/null; \
-	done; \
-	for dir in $(MONO_ADDINS_PATH); do \
-		cp $$dir/*.{dll,mdb,config} .run.tmp/Addins 2>/dev/null; \
-	done; \
-	cp $(top_builddir)/libbanshee/.libs/libbanshee.so .run.tmp || cp $(top_builddir)/libbanshee/libbanshee.so; .run.tmp; \
-	pushd .run.tmp; \
-	echo "<Addins><Directory>./Addins</Directory></Addins>" > Nereid.addins; \
-	$(MONO) --debug Nereid.exe --debug --uninstalled $(BANSHEE_DEV_OPTIONS); \
+	@pushd $(top_builddir); \
+	make run; \
 	popd;
 
-
-#	rm -rf .run.tmp
-
 MAINTAINERCLEANFILES = Makefile.in
 

Modified: trunk/banshee/src/Makefile.am
==============================================================================
--- trunk/banshee/src/Makefile.am	(original)
+++ trunk/banshee/src/Makefile.am	Sun Jan 27 06:51:58 2008
@@ -6,11 +6,9 @@
 EXTRA_DIST = AssemblyInfo.cs.in
 
 run:
-	pushd $(top_builddir)/src/Core; \
+	@pushd $(top_builddir); \
 	make run; \
 	popd;
 
-MAINTAINERCLEANFILES = \
-	Makefile.in
+MAINTAINERCLEANFILES = Makefile.in
 
-CLEANFILES = *.mdb *.pidb *.exe *.dll