* 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 b3a456683c0dacff08df07382c71f2f67a80067d..01175e008e5f812716447dc87152d680b890b6fe 100644 (file)
--- a/runtime/net_1_1/Makefile.am
+++ b/runtime/net_1_1/Makefile.am
@@ -2,22 +2,57 @@
 # being compiled on windows.
 #
 
-mcs_topdir=$(top_srcdir)/../mcs
 gacutil=$(srcdir)/../gacutil.exe
+framework_version = 1.0
 
-PROFILE=default
-
-if JIT_SUPPORTED
+if USE_JIT
 mono_runtime = $(top_builddir)/mono/mini/mono
 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                                   \
-       Cscompmgd                                       \
+       ByteFX.Data                                     \
+       Commons.Xml.Relaxng                             \
+       cscompmgd                                       \
+       I18N.CJK                                        \
+       I18N                                            \
+       I18N.MidEast                                    \
+       I18N.Other                                      \
+       I18N.Rare                                       \
+       I18N.West                                       \
+       IBM.Data.DB2                                    \
+       ICSharpCode.SharpZipLib                         \
+       Microsoft.VisualBasic                           \
+       Microsoft.VisualC                               \
+       Microsoft.Vsa                                   \
+       Mono.Cairo                                      \
+       $(MONO_CSHARP_DEBUGGER)                         \
+       Mono.Data.SybaseClient                          \
+       Mono.Data.SqliteClient                          \
+       Mono.Data.TdsClient                             \
+       Mono.Data.Tds                                   \
+       Mono.GetOptions                                 \
+       Mono.Http                                       \
+       Mono.Posix                                      \
        Mono.Security                                   \
        Mono.Security.Win32                             \
+       Novell.Directory.Ldap                           \
+       Npgsql                                          \
+       nunit.util                                      \
+       nunit.core                                      \
+       nunit.framework                                 \
+       PEAPI                                           \
        System.Configuration.Install                    \
        System.Data                                     \
        System.Data.OracleClient                        \
@@ -39,72 +74,39 @@ gac_assemblies_list = \
        System.Xml
 
 gac_assemblies = $(gac_assemblies_list:=.dll)
+mdb_files = $(gac_assemblies:=.mdb)
 
-non_gac_assemblies = \
-       ByteFX.Data.dll                                         \
-       Commons.Xml.Relaxng.dll                                 \
-       I18N.CJK.dll                                            \
-       I18N.dll                                                \
-       I18N.MidEast.dll                                        \
-       I18N.Other.dll                                          \
-       I18N.Rare.dll                                           \
-       I18N.West.dll                                           \
-       ICSharpCode.SharpZipLib.dll                             \
-       Microsoft.VisualBasic.dll                               \
-       Microsoft.VisualC.dll                                   \
-       Microsoft.Vsa.dll                                       \
-       Microsoft.Web.Services.dll                              \
-       Mono.Cairo.dll                                          \
-       Mono.CSharp.Debugger.dll                                \
-       Mono.Data.SqliteClient.dll                              \
-       Mono.Data.SybaseClient.dll                              \
-       Mono.Data.TdsClient.dll                                 \
-       Mono.Data.Tds.dll                                       \
-       Novell.Directory.Ldap.dll                               \
-       Mono.GetOptions.dll                                     \
-       Mono.Http.dll                                           \
-       Mono.Posix.dll                                          \
-       Npgsql.dll                                              \
-       NUnit.Util.dll                                          \
-       NUnit.Framework.dll                                     \
-       PEAPI.dll                                               
-
-corlibdir = $(libdir)
-dist_corlib_DATA = mscorlib.dll
-
-EXTRA_DIST = $(gac_assemblies)
-
-#
-# Keep in sync with mono/mono/metadata/Makefile.am
-#
-assembliesdir = $(libdir)
-dist_assemblies_DATA = $(non_gac_assemblies)
+corlibdir = $(libdir)/mono/$(framework_version)
+corlib_DATA = mscorlib.dll
 
-$(non_gac_assemblies):
-       @f=$(mcs_topdir)/class/lib/$(PROFILE)/$@; \
-       if test -f $$f; then :; else f=$(assembliesdir)/$@; fi ; \
-       echo "cp -f $$f $(srcdir)"; \
-       cp -f $$f $(srcdir)
+EXTRA_DIST = $(gac_assemblies) $(corlib_DATA) $(mdb_files)
+MAINTAINERCLEANFILES = $(EXTRA_DIST)
 
-mscorlib.dll $(gac_assemblies):
-       cp -f $(mcs_topdir)/class/lib/$(PROFILE)/$@ $(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) $(gacutil) /i $(srcdir)/$$i.dll /f /prefix $(DESTDIR)$(libdir)/mono/gac" ; \
+           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) \
-             $(mono_runtime) $(gacutil) /i $(srcdir)/$$i /f /prefix $(DESTDIR)$(libdir)/mono/gac || 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" ; \
+           echo "MONO_PATH=$(srcdir) $(mono_runtime) $(gacutil) /u $$i /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR)" ; \
            MONO_PATH=$(srcdir) \
-             $(mono_runtime) $(gacutil) /u $$i || exit 1 ; \
+             $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) /u $$i /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR) || true ; \
          done; fi
 
 copy_dlls: