Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiguel de Icaza <miguel@gnome.org>2016-06-14 23:57:09 +0300
committerGitHub <noreply@github.com>2016-06-14 23:57:09 +0300
commitaff1a51a389f09ca1865e54c16cfff4741435c8e (patch)
tree53e628ad93f7ce1e25957e45561c381cfe926113 /mcs/class/Novell.Directory.Ldap
parent6b3a592de0eb47d9d92ce3a012ac771319afb868 (diff)
WIP [library.make] Make resource usage declarative in the class libraries (#3159)
[library.make] Make resource usage declarative in the class libraries
Diffstat (limited to 'mcs/class/Novell.Directory.Ldap')
-rw-r--r--mcs/class/Novell.Directory.Ldap/Makefile17
-rw-r--r--mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-net_4_x.csproj2
2 files changed, 4 insertions, 15 deletions
diff --git a/mcs/class/Novell.Directory.Ldap/Makefile b/mcs/class/Novell.Directory.Ldap/Makefile
index 9e0d99d6c0b..4f24b424a7f 100644
--- a/mcs/class/Novell.Directory.Ldap/Makefile
+++ b/mcs/class/Novell.Directory.Ldap/Makefile
@@ -5,25 +5,14 @@ include ../../build/rules.make
LIBRARY = Novell.Directory.Ldap.dll
LIB_REFS = System Mono.Security
-LIB_MCS_FLAGS = \
- -warn:1 -nowarn:612 \
- $(RESX_RES:%=/res:%)
+LIB_MCS_FLAGS = -warn:1 -nowarn:612
+RESOURCE_DEFS = ResultCodeMessages,Novell.Directory.Ldap.Utilclass/ResultCodeMessages.txt
include ../../build/library.make
-RESULTCODE_MESSAGES = Novell.Directory.Ldap.Utilclass/ResultCodeMessages.resources
-
-RESX_RES = $(RESULTCODE_MESSAGES)
-
-$(the_lib): $(RESULTCODE_MESSAGES)
-
-$(RESULTCODE_MESSAGES): Novell.Directory.Ldap.Utilclass/ResultCodeMessages.txt
- $(RESGEN) $< $@
-
EXTRA_DISTFILES = \
Novell.Directory.Ldap.Rfc2251/RfcLdapURL.cs \
Novell.Directory.Ldap.Utilclass/ExceptionMessages.resx \
Novell.Directory.Ldap.Utilclass/ExceptionMessages.txt \
- Novell.Directory.Ldap.Utilclass/ResultCodeMessages.resx \
- Novell.Directory.Ldap.Utilclass/ResultCodeMessages.txt
+ Novell.Directory.Ldap.Utilclass/ResultCodeMessages.resx
diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-net_4_x.csproj b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-net_4_x.csproj
index fe6669ed6c3..90e5b13419f 100644
--- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-net_4_x.csproj
+++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-net_4_x.csproj
@@ -303,7 +303,7 @@
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="Novell.Directory.Ldap.Utilclass/ResultCodeMessages.resx">
+ <EmbeddedResource Include="Novell.Directory.Ldap.Utilclass/ResultCodeMessages.txt">
<LogicalName>ResultCodeMessages.resources</LogicalName>
</EmbeddedResource>
</ItemGroup>