* build/library.make (gacutil): Use net_1_1_bootstrap/gacutil.exe.

* Makefile (net_1_1_bootstrap_SUBDIRS): Add 'gacutil'.
* tools/gacutil/Makefile (PROGRAM): Make profile-specific during
net_1_1_bootstrap.

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

diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index a71391618305967c60a51e189c84aa284d36dba0..2308253fd7a0478e3616bc51d195e292f4e200d5 100644 (file)
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -3,6 +3,7 @@
        * executable.make (install-local): Depend on all-local even when
        NO_INSTALL is defined.
        * library.make: Minor cleanups to match executable.make.
+       (gacutil): Use net_1_1_bootstrap/gacutil.exe.
        * profiles/basic.make (no-install): Remove.
        * profiles/net_1_1_bootstrap.make (no-install): Likewise.
 

diff --git a/mcs/build/library.make b/mcs/build/library.make
index 0c45cbb2227d31c2d9eb8f6ce6f93e6da49f02a1..02ba123ec8e0f9ad752f236b4c70a32bcad2d883 100644 (file)
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -76,14 +76,18 @@ endif
 
 endif
 
-gacutil = $(topdir)/tools/gacutil/gacutil.exe
-GACUTIL = MONO_PATH="$(topdir)/class/lib/default$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(gacutil)
+ifdef NO_INSTALL
+GACUTIL = :
+else
+gacutil = $(topdir)/class/lib/net_1_1_bootstrap/gacutil.exe
+GACUTIL = MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(gacutil)
+endif
 
 ifdef NO_SIGN_ASSEMBLY
 SN = :
 else
 sn = $(topdir)/class/lib/net_1_1_bootstrap/sn.exe
-SN = MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap/$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(sn)
+SN = MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(sn)
 SNFLAGS = -q -R
 endif
 
@@ -221,8 +225,10 @@ ifndef LIBRARY_SNK
 LIBRARY_SNK = $(topdir)/class/mono.snk
 endif
 
+ifdef gacutil
 $(gacutil):
-       cd $(topdir)/tools/gacutil && $(MAKE) PROFILE=default
+       cd $(topdir) && $(MAKE) PROFILE=net_1_1_bootstrap
+endif
 
 ifdef sn
 $(sn):

diff --git a/mcs/tools/ChangeLog b/mcs/tools/ChangeLog
index cbaa612654b47a847922a53fe6d630c9ba04f5cd..625c8bc9e566507d65bb9c0c53fe8d9fa68c9bc1 100644 (file)
--- a/mcs/tools/ChangeLog
+++ b/mcs/tools/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-14  Raja R Harinath  <rharinath@novell.com>
+
+       * Makefile (net_1_1_bootstrap_SUBDIRS): Add 'gacutil'.
+
 2005-03-09  Ben Maurer  <bmaurer@ximian.com>
 
        * monogrind.pl: Renamed valgrind-monofunc.pl to this, per

diff --git a/mcs/tools/Makefile b/mcs/tools/Makefile
index d5740a014334ed1bac55ee7c8c6f54a5d2189b1f..9c8e3118a6bc0fb66f504af3f3bbfd994cadeaee 100644 (file)
--- a/mcs/tools/Makefile
+++ b/mcs/tools/Makefile
@@ -1,10 +1,10 @@
 thisdir = tools
-SUBDIRS =      \
-       al cilc corcompare ictool mono-xsd security wsdl genxs sqlsharp \
-       disco soapsuds browsercaps-updater monop gacutil mono-rpm-helpers       \
+SUBDIRS = \
+       al cilc corcompare ictool mono-xsd security wsdl genxs sqlsharp         \
+       disco soapsuds browsercaps-updater monop gacutil mono-rpm-helpers       \
        resgen macpack mkbundle dtd2xsd mjs prj2make
 
-net_1_1_bootstrap_SUBDIRS = security
+net_1_1_bootstrap_SUBDIRS = gacutil security
 
 net_2_0_SUBDIRS = wsdl
 

diff --git a/mcs/tools/gacutil/ChangeLog b/mcs/tools/gacutil/ChangeLog
index a7be843ca6e0acc2aa483660b63d54b81a23eb9e..8a5d205e658b1fe7a867522816ed917d03b7a376 100644 (file)
--- a/mcs/tools/gacutil/ChangeLog
+++ b/mcs/tools/gacutil/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-14  Raja R Harinath  <rharinath@novell.com>
+
+       * Makefile (PROGRAM): Make profile-specific during
+       net_1_1_bootstrap.
+
 2005-01-18  Raja R Harinath  <rharinath@novell.com>
 
        * driver.cs (Install): Restore fix from 2004-12-08.

diff --git a/mcs/tools/gacutil/Makefile b/mcs/tools/gacutil/Makefile
index f72b7176ee8982c3edd3dabb0eeded4c5c71a832..33342a428e823084aa393b74b1f646637f119b0d 100644 (file)
--- a/mcs/tools/gacutil/Makefile
+++ b/mcs/tools/gacutil/Makefile
@@ -3,6 +3,11 @@ SUBDIRS =
 include ../../build/rules.make
 
 LOCAL_MCS_FLAGS = /r:Mono.Security.dll
+
+ifeq (net_1_1_bootstrap, $(PROFILE))
+PROGRAM = $(topdir)/class/lib/$(PROFILE)/gacutil.exe
+else
 PROGRAM = gacutil.exe
+endif
 
 include ../../build/executable.make