* library.make: Update $(MDOC_UP) to remove the net_1_ detection.

[mono.git] / mcs / build / library.make

diff --git a/mcs/build/library.make b/mcs/build/library.make
index 51fa22634fe261e3f136e7d44f7e3a22bdb2c444..c35bfd2d53ce8f0777e644f259af0b9323506f2b 100644 (file)
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -67,9 +67,9 @@ library_CLEAN_FILES += $(build_lib) $(build_lib:.dll=.pdb)
 ifdef NO_SIGN_ASSEMBLY
 SN = :
 else
-sn = $(topdir)/class/lib/net_1_1_bootstrap/sn.exe
-SN = $(Q) MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(sn)
-SNFLAGS = -q -R
+sn = $(topdir)/class/lib/basic/sn.exe
+SN = $(Q) MONO_PATH="$(topdir)/class/lib/basic$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(sn)
+SNFLAGS = -q
 endif
 
 ifeq ($(PLATFORM), win32)
@@ -81,7 +81,9 @@ GACDIR = $(mono_libdir)
 GACROOT = $(DESTDIR)$(mono_libdir)
 endif
 
+ifndef NO_BUILD
 all-local: $(the_lib) $(extra_targets)
+endif
 
 ifeq ($(LIBRARY_COMPILE),$(BOOT_COMPILE))
 is_boot=true
@@ -90,7 +92,7 @@ is_boot=false
 endif
 
 csproj-local: 
-       config_file=`basename $(LIBRARY_NAME) .dll`-$(PROFILE).input; \
+       config_file=`basename $(LIBRARY) .dll`-$(PROFILE).input; \
        echo $(thisdir):$$config_file >> $(topdir)/../mono/msvc/scripts/order; \
        (echo $(is_boot); \
        echo $(MCS);    \
@@ -201,16 +203,6 @@ ifndef LIBRARY_SNK
 LIBRARY_SNK = $(topdir)/class/mono.snk
 endif
 
-ifdef gacutil
-$(gacutil):
-       cd $(topdir) && $(MAKE) PROFILE=net_1_1_bootstrap
-endif
-
-ifdef sn
-$(sn):
-       cd $(topdir) && $(MAKE) PROFILE=net_1_1_bootstrap
-endif
-
 ifdef BUILT_SOURCES
 ifeq (cat, $(PLATFORM_CHANGE_SEPARATOR_CMD))
 BUILT_SOURCES_cmdline = $(BUILT_SOURCES)
@@ -225,11 +217,12 @@ $(the_lib): $(the_libdir)/.stamp
 
 $(build_lib): $(response) $(sn) $(BUILT_SOURCES) $(build_libdir:=/.stamp)
        $(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) -target:library -out:$@ $(BUILT_SOURCES_cmdline) @$(response)
-       $(SN) $(SNFLAGS) $@ $(LIBRARY_SNK)
+       $(SN) $(SNFLAGS) -R $@ $(LIBRARY_SNK)
 
 ifdef LIBRARY_USE_INTERMEDIATE_FILE
 $(the_lib): $(build_lib)
        $(Q) cp $(build_lib) $@
+       $(SN) $(SNFLAGS) -v $@
        $(Q) test ! -f $(build_lib).mdb || mv $(build_lib).mdb $@.mdb
        $(Q) test ! -f $(build_lib:.dll=.pdb) || mv $(build_lib:.dll=.pdb) $(the_lib:.dll=.pdb)
 endif
@@ -276,13 +269,8 @@ $(makefrag) $(test_response) $(test_makefrag) $(btest_response) $(btest_makefrag
 
 Q_MDOC_UP=$(if $(V),,@echo "MDOC-UP [$(PROFILE)] $(notdir $(@))";)
 MDOC_UP  =$(Q_MDOC_UP) \
-       if `echo $(PROFILE) | grep ^net_1_ > /dev/null 2>/dev/null` ; then    \
-               $(RUNTIME) $(topdir)/tools/mdoc/monodocer1.exe                      \
-                       -path:Documentation/en -assembly:$(the_lib) ;                     \
-       else                                                                  \
                $(RUNTIME) $(topdir)/tools/mdoc/mdoc.exe update --delete            \
-                       -o Documentation/en $(the_lib) ;                                  \
-       fi
+                       -o Documentation/en $(the_lib)
 
 doc-update-local: $(the_libdir)/.doc-stamp