X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FMicrosoft.Build.Engine%2FMakefile;h=9aed81206542d94d4976f0974107b89d405a8e89;hb=dfac8517b91687f11479801fa0a2191585b1ad4c;hp=2bf7d9b8c66991349d2e265aa01c4c4f008d30ed;hpb=425fdc03fa38b2ee29c1cf88617ddb1580fde78f;p=mono.git

diff --git a/mcs/class/Microsoft.Build.Engine/Makefile b/mcs/class/Microsoft.Build.Engine/Makefile
index 2bf7d9b8c66..9aed8120654 100644
--- a/mcs/class/Microsoft.Build.Engine/Makefile
+++ b/mcs/class/Microsoft.Build.Engine/Makefile
@@ -7,50 +7,28 @@ include $(XBUILD_DIR)/xbuild.make
 
 LIBRARY = Microsoft.Build.Engine.dll
 
-LIB_MCS_FLAGS = \
-	/r:$(corlib)		\
-	/r:System.dll		\
-	/r:System.Core.dll	\
-	/r:System.Xml.dll	\
-	/r:$(XBUILD_FRAMEWORK)	\
-	/r:$(XBUILD_UTILITIES)
-
-TEST_MCS_FLAGS = \
-	/r:$(XBUILD_FRAMEWORK)	\
-	/r:$(XBUILD_UTILITIES) \
-	/r:System.Xml.dll
+LIB_REFS = $(PARENT_PROFILE)System $(PARENT_PROFILE)System.Core $(PARENT_PROFILE)System.Xml $(XBUILD_FRAMEWORK) $(XBUILD_UTILITIES)
+LIB_MCS_FLAGS =
+
+TEST_MCS_FLAGS =
+TEST_LIB_REFS = $(XBUILD_FRAMEWORK) $(XBUILD_UTILITIES) $(PARENT_PROFILE)System.Xml
 
 EXTRA_DISTFILES = \
 	Test/resources/TestTasks.cs		\
 	Test/resources/*.*proj	\
-	Test/resources/*.csproj \
-	Test/test-config-file*
-
-Test/resources/TestTasks.dll: Test/resources/TestTasks.cs
-	$(CSCOMPILE) Test/resources/TestTasks.cs /r:$(XBUILD_FRAMEWORK) /r:$(XBUILD_UTILITIES) /target:library
-
-clean-local: clean-test-tasks
-
-clean-test-tasks:
-	rm -f Test/resources/TestTasks.dll	
+	Test/resources/*.csproj
 
-test-local: copy-config
+CLEAN_FILES = Test/resources/TestTasks-$(PROFILE).dll Test/resources/TestTasks-$(PROFILE).dll.mdb Test/resources/TestTasks-$(PROFILE).pdb
 
-ifeq (net_4_0, $(PROFILE))
-copy-config:
-	cp Test/test-config-file-net-4.0 $(test_lib).config
-else
-ifeq (net_3_5, $(PROFILE))
-copy-config:
-	cp Test/test-config-file-net-3.5 $(test_lib).config
-else
-copy-config:
-endif
-endif
+Test/resources/TestTasks-$(PROFILE).dll: Test/resources/TestTasks.cs
+	$(CSCOMPILE) /out:$@ Test/resources/TestTasks.cs /r:$(topdir)/class/lib/$(PROFILE)/$(XBUILD_FRAMEWORK).dll /r:$(topdir)/class/lib/$(PROFILE)/$(XBUILD_UTILITIES).dll /target:library
 
-export TESTING_MONO=a
-include $(XBUILD_DIR)/xbuild_targets.make
+test-local: compile-resources
 
-test-local: Test/resources/TestTasks.dll
+compile-resources: Test/resources/TestTasks-$(PROFILE).dll
+	cp Test/resources/TestTasks-$(PROFILE).dll Test/resources/TestTasks.dll
+	cp Test/resources/TestTasks-$(PROFILE).dll.mdb Test/resources/TestTasks.dll.mdb
+#	cp Test/resources/TestTasks-$(PROFILE).pdb Test/resources/TestTasks.pdb
 
+include $(XBUILD_DIR)/xbuild_test.make
 include ../../build/library.make