* configure.in (mcs_topdir, mcs_topdir_from_srcdir): New 'subst'ed

[mono.git] / runtime / net_1_1 / Makefile.am

diff --git a/runtime/net_1_1/Makefile.am b/runtime/net_1_1/Makefile.am
index b347f21ab3f245b75398ef9f98355fd9cabd52f7..01175e008e5f812716447dc87152d680b890b6fe 100644 (file)
--- a/runtime/net_1_1/Makefile.am
+++ b/runtime/net_1_1/Makefile.am
@@ -2,8 +2,8 @@
 # being compiled on windows.
 #
 
-mcs_topdir=$(top_srcdir)/../mcs
 gacutil=$(srcdir)/../gacutil.exe
+framework_version = 1.0
 
 if USE_JIT
 mono_runtime = $(top_builddir)/mono/mini/mono
@@ -11,6 +11,15 @@ else
 mono_runtime = $(top_builddir)/mono/interpreter/mint
 endif
 
+MONO_CSHARP_DEBUGGER = Mono.CompilerServices.SymbolWriter
+if PLATFORM_WIN32
+GAC_DIR = `cygpath -w $(libdir)`
+GAC_ROOT_DIR = `cygpath -w $(DESTDIR)$(libdir)`
+else
+GAC_DIR = $(libdir)
+GAC_ROOT_DIR = $(DESTDIR)$(libdir)
+endif
+
 gac_assemblies_list = \
        Accessibility                                   \
        ByteFX.Data                                     \
@@ -22,12 +31,13 @@ gac_assemblies_list = \
        I18N.Other                                      \
        I18N.Rare                                       \
        I18N.West                                       \
+       IBM.Data.DB2                                    \
        ICSharpCode.SharpZipLib                         \
        Microsoft.VisualBasic                           \
        Microsoft.VisualC                               \
        Microsoft.Vsa                                   \
        Mono.Cairo                                      \
-       Mono.CSharp.Debugger                            \
+       $(MONO_CSHARP_DEBUGGER)                         \
        Mono.Data.SybaseClient                          \
        Mono.Data.SqliteClient                          \
        Mono.Data.TdsClient                             \
@@ -39,8 +49,9 @@ gac_assemblies_list = \
        Mono.Security.Win32                             \
        Novell.Directory.Ldap                           \
        Npgsql                                          \
-       NUnit.Util                                      \
-       NUnit.Framework                                 \
+       nunit.util                                      \
+       nunit.core                                      \
+       nunit.framework                                 \
        PEAPI                                           \
        System.Configuration.Install                    \
        System.Data                                     \
@@ -63,37 +74,39 @@ gac_assemblies_list = \
        System.Xml
 
 gac_assemblies = $(gac_assemblies_list:=.dll)
+mdb_files = $(gac_assemblies:=.mdb)
 
-corlibdir = $(libdir)
+corlibdir = $(libdir)/mono/$(framework_version)
 corlib_DATA = mscorlib.dll
 
-EXTRA_DIST = $(gac_assemblies) $(corlib_DATA)
+EXTRA_DIST = $(gac_assemblies) $(corlib_DATA) $(mdb_files)
 MAINTAINERCLEANFILES = $(EXTRA_DIST)
 
-#
-# Keep in sync with mono/mono/metadata/Makefile.am
-#
-assembliesdir = $(libdir)
-
-mscorlib.dll $(gac_assemblies):
-       cp -f $(mcs_topdir)/class/lib/default/$@ $(srcdir)
+mscorlib.dll $(gac_assemblies) $(mdb_files):
+       test -f $(mcs_topdir)/class/lib/default/$@
+       -rm -f $(srcdir)/$@
+       cd $(srcdir) && $(LN_S) $(mcs_topdir_from_srcdir)/class/lib/default/$@ $@
 
-all-local: $(gac_assemblies)
+all-local: $(gac_assemblies) $(mdb_files)
 
 install-data-local:
+       @if test -f $(srcdir)/mscorlib.dll.mdb; then \
+         echo $(INSTALL_DATA) $(srcdir)/mscorlib.dll.mdb $(DESTDIR)$(corlibdir)/mscorlib.dll.mdb; \
+         $(INSTALL_DATA) $(srcdir)/mscorlib.dll.mdb $(DESTDIR)$(corlibdir)/mscorlib.dll.mdb; \
+       fi
        @if test -n '$(gac_assemblies)'; then \
          for i in ''$(gac_assemblies); do \
-           echo "MONO_PATH=$(srcdir) $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package 1.0 /root $(DESTDIR)$(libdir)" ; \
+           echo "MONO_PATH=$(srcdir) $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package $(framework_version) /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR)" ; \
            MONO_PATH=$(srcdir) \
-             $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package 1.0 /root $(DESTDIR)$(libdir) || exit 1 ; \
+             $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package $(framework_version) /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR) || exit 1 ; \
          done; fi
 
 uninstall-local:
        @if test -n '$(gac_assemblies_list)'; then \
          for i in ''$(gac_assemblies_list); do \
-           echo "MONO_PATH=$(srcdir) $(mono_runtime) $(gacutil) /u $$i /root $(DESTDIR)$(libdir)" ; \
+           echo "MONO_PATH=$(srcdir) $(mono_runtime) $(gacutil) /u $$i /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR)" ; \
            MONO_PATH=$(srcdir) \
-             $(LIBTOOL) --mode=execute $(mono_runtime) $(gacutil) /u $$i /root $(DESTDIR)$(libdir) || true ; \
+             $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) /u $$i /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR) || true ; \
          done; fi
 
 copy_dlls: