In nunit20/util:

	* Makefile ($(RESX_RES)): Pass argument of RESGEN through
	PLATFORM_CHANGE_SEPARATOR_CMD.

In class/Npgsql:
	* Makefile (CLEAN_FILES): Add $(RESX_RES).
	($(the_lib)): Depend on $(OTHER_RES) too.
	($(RESX_RES)): Pass argument of RESGEN through
	PLATFORM_CHANGE_SEPARATOR_CMD.

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

diff --git a/mcs/class/Npgsql/ChangeLog b/mcs/class/Npgsql/ChangeLog
index 604d1b0c3177e0f5ee31fc311383d8db73f52602..aa4c6072682c9edf5958f3a919790e27ba4fac44 100644 (file)
--- a/mcs/class/Npgsql/ChangeLog
+++ b/mcs/class/Npgsql/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-07  Raja R Harinath  <rharinath@novell.com>
+
+       * Makefile (CLEAN_FILES): Add $(RESX_RES).
+       ($(the_lib)): Depend on $(OTHER_RES) too.
+       ($(RESX_RES)): Pass argument of RESGEN through
+       PLATFORM_CHANGE_SEPARATOR_CMD.
+
 2004-12-05  Francisco Figueiredo Jr.  <fxjrlists@yahoo.com>
 
        * Npgsql/NpgsqlCommand.cs: gborg 971 & 1068: Added support for ParameterDirection.Output and ParameterDirection.InputOutput parameters. Now you can use these types of parameters to get results. Thanks Ivan (ivan-sun1 at mail dot ru) and (teste at aslls dot ss) for heads up.

diff --git a/mcs/class/Npgsql/Makefile b/mcs/class/Npgsql/Makefile
index 9447ef682734a3b76984ed774b0bf1eb542168c9..c7023c9cd523c898706f08d05b3602194246ec3d 100755 (executable)
--- a/mcs/class/Npgsql/Makefile
+++ b/mcs/class/Npgsql/Makefile
@@ -32,7 +32,7 @@ EXTRA_DISTFILES = \
        $(OTHER_RES)            \
        Npgsql.dll.resources
 
-include ../../build/library.make
+CLEAN_FILES = $(RESX_RES)
 
 OTHER_RES = \
        Npgsql/NpgsqlConnection.bmp             \
@@ -55,7 +55,9 @@ RESX_RES = \
        NpgsqlTypes/NpgsqlTypesHelper.resources                 \
        Npgsql/Design/ConnectionStringEditorForm.resources
 
-$(the_lib): $(RESX_RES)
+include ../../build/library.make
+
+$(the_lib): $(RESX_RES) $(OTHER_RES)
 
-%.resources: %.resx
-       $(RESGEN) $<
+$(RESX_RES): %.resources: %.resx
+       $(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)`

diff --git a/mcs/nunit20/util/ChangeLog b/mcs/nunit20/util/ChangeLog
index e83f069a179c72eea28fdaf744193dd164fc61c8..1e21c14591b2c4255f88156bf0e421b166331873 100644 (file)
--- a/mcs/nunit20/util/ChangeLog
+++ b/mcs/nunit20/util/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-07  Raja R Harinath  <rharinath@novell.com>
+
+       * Makefile ($(RESX_RES)): Pass argument of RESGEN through
+       PLATFORM_CHANGE_SEPARATOR_CMD.
+
 2004-12-03  Atsushi Enomoto  <atsushi@ximian.com>
 
        * XmlResultVisitor.cs : ... was still broken.

diff --git a/mcs/nunit20/util/Makefile b/mcs/nunit20/util/Makefile
index 1f7e6fe486b7ef1725e0fef8827823b2b4848c9a..3d797c6cd6912285a8be18f051c3206eff56c2c6 100644 (file)
--- a/mcs/nunit20/util/Makefile
+++ b/mcs/nunit20/util/Makefile
@@ -2,8 +2,6 @@ thisdir = nunit20/util
 SUBDIRS = 
 include ../../build/rules.make
 
-CLEAN_FILES = Transform.resources
-
 LIBRARY = NUnit.Util.dll
 LIBRARY_NAME = nunit.util.dll
 LIBRARY_SNK = $(topdir)/nunit.key
@@ -18,13 +16,17 @@ ifeq (net_2_0, $(PROFILE))
 NO_INSTALL = yes
 endif
 
+RESX_RES = Transform.resources
+
 EXTRA_DISTFILES = \
        nunit.util.dll.csproj   \
-       Transform.resx
+       $(RESX_RES:.resources=.resx)
 
-%.resources: %.resx
-       $(RESGEN) $<
+CLEAN_FILES = $(RESX_RES)
 
 include ../../build/library.make
 
-$(the_lib): Transform.resources
+$(the_lib): $(RESX_RES)
+
+$(RESX_RES): %.resources: %.resx
+       $(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)`