[Monodevelop-patches-list] r1258 - in trunk/MonoDevelop: . src/AddIns src/AddIns/Nunit

[commit-watcher at mono-cvs.ximian.com]

Author: jluke
Date: 2004-03-26 15:48:19 -0500 (Fri, 26 Mar 2004)
New Revision: 1258

Modified:
   trunk/MonoDevelop/configure.in
   trunk/MonoDevelop/src/AddIns/Makefile.am
   trunk/MonoDevelop/src/AddIns/Nunit/Makefile.am
Log:
distcheck and dont install the nunit stuff yet


Modified: trunk/MonoDevelop/configure.in
===================================================================
--- trunk/MonoDevelop/configure.in	2004-03-26 20:22:28 UTC (rev 1257)
+++ trunk/MonoDevelop/configure.in	2004-03-26 20:48:19 UTC (rev 1258)
@@ -127,6 +127,7 @@
 src/AddIns/Misc/Makefile
 src/AddIns/Misc/StartPage/Makefile
 src/AddIns/DebuggerAddIn/Makefile
+src/AddIns/Nunit/Makefile
 src/Main/Makefile
 src/Main/Base/Makefile
 src/Main/StartUp/Makefile
@@ -166,7 +167,6 @@
 src/AddIns/DebuggerAddIn/AssemblyInfo.cs
 src/AddIns/DisplayBindings/SourceEditor/AssemblyInfo.cs
 src/AddIns/Misc/StartPage/AssemblyInfo.cs
-src/AddIns/Nunit/Makefile
 src/Main/StartUp/AssemblyInfo.cs
 src/Main/Base/AssemblyInfo.cs
 src/Libraries/MonoDevelop.Gui.Widgets/AssemblyInfo.cs

Modified: trunk/MonoDevelop/src/AddIns/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/Makefile.am	2004-03-26 20:22:28 UTC (rev 1257)
+++ trunk/MonoDevelop/src/AddIns/Makefile.am	2004-03-26 20:48:19 UTC (rev 1258)
@@ -1 +1 @@
-SUBDIRS=DisplayBindings BackendBindings Misc DebuggerAddIn
+SUBDIRS = DisplayBindings BackendBindings Misc DebuggerAddIn Nunit

Modified: trunk/MonoDevelop/src/AddIns/Nunit/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/Nunit/Makefile.am	2004-03-26 20:22:28 UTC (rev 1257)
+++ trunk/MonoDevelop/src/AddIns/Nunit/Makefile.am	2004-03-26 20:48:19 UTC (rev 1258)
@@ -1,7 +1,7 @@
 
 CSC = mcs /debug
 ASSEMBLY = MonoDevelop.Nunit.dll
-ADDIN = MonoDevelopNunit.addin
+ADDIN = $(srcdir)/MonoDevelopNunit.addin
 
 DLLS = /r:NUnit.Framework.dll \
 	/r:gtk-sharp.dll /r:glib-sharp.dll /r:gdk-sharp.dll \
@@ -26,17 +26,17 @@
 ./Services/QueuedTestFinish.cs \
 ./Services/QueuedTestStart.cs
 
+build_sources = $(addprefix $(srcdir)/, $(FILES))
+
 all: $(ASSEMBLY)
 
-../../../build/AddIns/$(ADDIN): $(ADDIN)
-	cp $(ADDIN) ../../../build/AddIns/$(ADDIN)
-
 $(ASSEMBLY): ../../../build/AddIns/$(ADDIN) $(FILES)
-	$(CSC) $(DLLS) $(FILES) /out:$(ASSEMBLY) /target:library \
+	$(CSC) $(DLLS) $(build_sources) /out:$(ASSEMBLY) /target:library \
 	&& cp $(ASSEMBLY) ../../../build/AddIns/.
 
-addindir = $(libdir)/monodevelop/AddIns
-addin_DATA = $(ASSEMBLY) $(ADDIN)
+# not ready to be installed yet
+#addindir = $(libdir)/monodevelop/AddIns
+#addin_DATA = $(ASSEMBLY) $(ADDIN)
 
 CLEANFILES = $(ASSEMBLY)