merge -r 58807:58808

svn path=/branches/mainsoft/gh1.7/mcs/; revision=58813

diff --git a/mcs/class/Novell.Directory.Ldap/Makefile b/mcs/class/Novell.Directory.Ldap/Makefile
index 3db4b055bea09421123efea0cbcca65ce26bf237..3987a2e09ca7e1bfe01e00e89eadacf8a49684ba 100644 (file)
--- a/mcs/class/Novell.Directory.Ldap/Makefile
+++ b/mcs/class/Novell.Directory.Ldap/Makefile
@@ -3,13 +3,15 @@ SUBDIRS =
 include ../../build/rules.make
 
 LIBRARY = Novell.Directory.Ldap.dll
+
+ifeq (net_1_1_java, $(PROFILE))
 LIB_MCS_FLAGS = \
        /nowarn:649 /nowarn:169 /nowarn:219 /nowarn:168 \
        -r:$(corlib)                            \
        -r:System.dll                           \
-       -r:Mono.Security.dll
-
-ifeq (net_1_1_java, $(PROFILE))
+       -r:rt.dll                                       \
+       -r:J2SE.Helpers.dll                     \
+       $(RESX_RES:%=/res:%)
 
 RESCODEMESS = Novell.Directory.Ldap.Utilclass/Novell.Directory.Ldap.Utilclass.ResultCodeMessages.resources
 EXCEPTMESS = Novell.Directory.Ldap.Utilclass/Novell.Directory.Ldap.Utilclass.ExceptionMessages.resources
@@ -23,6 +25,12 @@ LIB_MCS_FLAGS +=     \
        -r:J2SE.Helpers.dll \
        $(RESX_RES:%=/res:%)
 
+else
+LIB_MCS_FLAGS = \
+       /nowarn:649 /nowarn:169 /nowarn:219 /nowarn:168 \
+       -r:$(corlib)                            \
+       -r:System.dll                           \
+       -r:Mono.Security.dll
 endif
 
 NO_TEST = yes