Merge pull request #2721 from ludovic-henry/fix-mono_ms_ticks

[mono.git] / mcs / class / System.Configuration / Makefile

diff --git a/mcs/class/System.Configuration/Makefile b/mcs/class/System.Configuration/Makefile
index 743008e82ba2a8aa65b5f2c30f8033f417f24d92..5815830b6b9f18d4010a81939caa006ba5bd1585 100644 (file)
--- a/mcs/class/System.Configuration/Makefile
+++ b/mcs/class/System.Configuration/Makefile
@@ -1,20 +1,36 @@
 thisdir = class/System.Configuration
 SUBDIRS =
+
 include ../../build/rules.make
 
 LIBRARY = System.Configuration.dll
-LIBRARY_USE_INTERMEDIATE_FILE = yes
-
-LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -r:System.Xml.dll -r:System.Security.dll
-TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
-# This is a .NET 2.0+ only assembly
-VALID_PROFILE := $(filter net_2_0 net_4_0_bootstrap net_4_0 net_4_5, $(PROFILE))
-ifndef VALID_PROFILE
-LIBRARY_NAME = dummy-System.Configuration.dll
-NO_INSTALL = yes
-NO_SIGN_ASSEMBLY = yes
-NO_TEST = yes
-endif
+LOCAL_MCS_FLAGS = 
+LIB_REFS = secxml/System bare/System.Xml System.Security
+LIB_MCS_FLAGS = -nowarn:618
+TEST_MCS_FLAGS =
+TEST_LIB_REFS = System.Xml System
 
 include ../../build/library.make
+
+configuration_library_deps = \
+       $(secxml_libdir)/System.dll     \
+       $(the_libdir_base)System.Security.dll   \
+       $(bare_libdir)/System.Xml.dll
+
+$(build_lib): $(configuration_library_deps)
+
+.NOTPARALLEL: $(configuration_library_deps)
+
+$(secxml_libdir)/System.dll:
+       @echo System.Configuration: GETTING: $@
+       (cd ../System; $(MAKE) $@)
+
+$(the_libdir_base)System.Security.dll:
+       (cd ../System.Security; $(MAKE) $@)
+
+$(bare_libdir)/System.Xml.dll:
+       (cd ../System.XML; $(MAKE) $@)
+
+run-test:
+       $(MAKE) -C Test/standalone
\ No newline at end of file