projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'BigIntegerParse'
[mono.git]
/
mcs
/
class
/
Microsoft.Build.Framework
/
Makefile
diff --git
a/mcs/class/Microsoft.Build.Framework/Makefile
b/mcs/class/Microsoft.Build.Framework/Makefile
index 74043402bbc66a63ff7140af0d74033b719c4be2..73f43fb74c773eab3c4c6617c6f2c3c6ede45f52 100644
(file)
--- a/
mcs/class/Microsoft.Build.Framework/Makefile
+++ b/
mcs/class/Microsoft.Build.Framework/Makefile
@@
-2,20
+2,17
@@
thisdir = class/Microsoft.Build.Framework
SUBDIRS =
include ../../build/rules.make
SUBDIRS =
include ../../build/rules.make
-LIBRARY = Microsoft.Build.Framework.dll
+XBUILD_DIR=$(topdir)/tools/xbuild
+include $(XBUILD_DIR)/xbuild.make
-ifeq (1.0, $(FRAMEWORK_VERSION))
-LIBRARY_NAME = dummy-Microsoft.Build.Framework.dll
-NO_INSTALL = yes
-NO_TEST = yes
-NO_SIGN_ASSEMBLY = yes
-endif
+LIBRARY = Microsoft.Build.Framework.dll
LIB_MCS_FLAGS = \
/r:$(corlib) \
/r:System.dll
LIB_MCS_FLAGS = \
/r:$(corlib) \
/r:System.dll
-include ../../build/library.make
-
EXTRA_DISTFILES = \
Mono.XBuild.Framework/AssemblyLoadInfo.cs
EXTRA_DISTFILES = \
Mono.XBuild.Framework/AssemblyLoadInfo.cs
+
+include ../../build/library.make
+include $(XBUILD_DIR)/xbuild_test.make