2003-10-22 Dick Porter <dick@ximian.com>

	* platforms/win32.make:
	* platforms/linux.make:
	* rules.make: Added RESGEN platform-specific tool.

svn path=/trunk/mcs/; revision=19300

diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index 1f11d237f777d78130e3074a0c37244e5e76c2f9..3cc9a142d31c62a6f5fa52938dd0a07944d8cf57 100644 (file)
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-22  Dick Porter  <dick@ximian.com>
+
+       * platforms/win32.make:
+       * platforms/linux.make:
+       * rules.make: Added RESGEN platform-specific tool.
+
 2003-08-03  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * config-default.make: the /nowarn arguments are now set on a per

diff --git a/mcs/build/platforms/linux.make b/mcs/build/platforms/linux.make
index cf69bff0edf7d83749094777e273ce20c54baadf..3f78994ef775fc0fa5785dc4a2513ecf938524f4 100644 (file)
--- a/mcs/build/platforms/linux.make
+++ b/mcs/build/platforms/linux.make
@@ -9,6 +9,7 @@ PLATFORM_RUNTIME = $(RUNTIME)
 PLATFORM_CORLIB = corlib.dll
 
 BOOTSTRAP_MCS = mcs
+RESGEN = monoresgen
 
 # Define this if this ever will work on Linux
 # PLATFORM_MAKE_CORLIB_CMP = yes

diff --git a/mcs/build/platforms/win32.make b/mcs/build/platforms/win32.make
index e2023b2ff5b0f8b1b9eb3ac2ce8d60ef3af90277..8da86872add8e3caf4f80b3a85c6b71a0c5fcb3a 100644 (file)
--- a/mcs/build/platforms/win32.make
+++ b/mcs/build/platforms/win32.make
@@ -10,6 +10,7 @@ PLATFORM_CORLIB = mscorlib.dll
 
 BOOTSTRAP_MCS = csc.exe
 MCS = $(BOOTSTRAP_MCS)
+RESGEN = resgen.exe
 
 PLATFORM_MAKE_CORLIB_CMP = yes
 PLATFORM_TWEAK_CORLIB_SOURCES=cat - corlib.dll.win32-excludes |sort |uniq -u

diff --git a/mcs/build/rules.make b/mcs/build/rules.make
index 8f3d2ac7c06c7133a461044deb8416af26ef3b9d..a31a49e87cf4eb022fe2cef68bf34be7a4d0e673 100644 (file)
--- a/mcs/build/rules.make
+++ b/mcs/build/rules.make
@@ -43,6 +43,7 @@ export MKINSTALLDIRS
 export TEST_HARNESS
 export BOOTSTRAP_MCS
 export DESTDIR
+export RESGEN
 
 # Get this so the platform.make platform-check rule doesn't become the
 # default target

diff --git a/mcs/class/Npgsql/Makefile b/mcs/class/Npgsql/Makefile
index 0ebfe6d1a1398503e866e392df5961544621d615..906f27721b03eb37079abc29995a713389ff8fa6 100755 (executable)
--- a/mcs/class/Npgsql/Makefile
+++ b/mcs/class/Npgsql/Makefile
@@ -54,7 +54,7 @@ RESX_RES = Npgsql/NpgsqlState.resources Npgsql/NpgsqlClosedState.resources Npgsq
 all: $(RESX_RES) $(the_lib)
 
 %.resources: %.resx
-       monoresgen $<
+       $(RESGEN) $<
 
 clean: clean-recursive clean-local