diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2004-11-08 12:25:30 +0300 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2004-11-08 12:25:30 +0300 |
| commit | 24c15a5dd1af5a324ff0db179d31e2a62f38cb40 (patch) | |
| tree | 9fb520eaf39893073ad8c544587fe250a7b20c13 /runtime | |
| parent | f6a6ca4b9328c276fade68f32b1a3bdaeb54e54c (diff) | |
* configure.in (mcs_topdir, mcs_topdir_from_srcdir): New 'subst'ed
variables. Used to support both an in-tree mcs/ and a sibling
mcs/ directory.
* Makefile.am (mcs_topdir): Remove.
(dist-hook): Distribute mcs/ as a subdirectory.
* runtime/Makefile.am ($(monoone_DATA) $(monotwo_DATA) $(monobins_DATA)):
Use mcs_topdir and mcs_topdir_from_srcdir.
* runtime/net_1_1/Makefile.am (mscorlib.dll $(gac_assemblies) $(mdb_files)):
Likewise.
(all-local): Depend on $(mdb_files) too.
* runtime/net_2_0/Makefile.am: Likewise.
svn path=/trunk/mono/; revision=35821
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/Makefile.am | 10 | ||||
| -rw-r--r-- | runtime/net_1_1/Makefile.am | 8 | ||||
| -rw-r--r-- | runtime/net_2_0/Makefile.am | 6 |
3 files changed, 10 insertions, 14 deletions
diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 09c89564fb0..0096563a6f7 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -4,8 +4,6 @@ SUBDIRS = . net_1_1 net_2_0 -mcs_topdir=$(top_srcdir)/../mcs - monobins_DATA = \ monoresgen.exe \ monoresgen.exe.mdb \ @@ -93,12 +91,12 @@ $(monoone_DATA) $(monotwo_DATA) $(monobins_DATA): wsdl*) d=tools/wsdl ;; \ sqlsharp) d=tools/SqlSharp ;; \ esac; \ - echo "test -f $(top_srcdir)/../mcs/$$d/$@" ; \ - test -f $(top_srcdir)/../mcs/$$d/$@ || exit 1 ; \ + echo "test -f $(mcs_topdir)/$$d/$@" ; \ + test -f $(mcs_topdir)/$$d/$@ || exit 1 ; \ echo "rm -f $(srcdir)/$@" ; \ rm -f $(srcdir)/$@ ; \ - echo "cd $(srcdir) && $(LN_S) ../../mcs/$$d/$@ $@" ; \ - cd $(srcdir) && $(LN_S) ../../mcs/$$d/$@ $@ + echo "cd $(srcdir) && $(LN_S) $(mcs_topdir_from_srcdir)/$$d/$@ $@" ; \ + cd $(srcdir) && $(LN_S) $(mcs_topdir_from_srcdir)/$$d/$@ $@ copy_dlls: cp /nt/mono/mcs/class/*/*.dll . diff --git a/runtime/net_1_1/Makefile.am b/runtime/net_1_1/Makefile.am index 4bd0f9113de..01175e008e5 100644 --- a/runtime/net_1_1/Makefile.am +++ b/runtime/net_1_1/Makefile.am @@ -83,13 +83,11 @@ EXTRA_DIST = $(gac_assemblies) $(corlib_DATA) $(mdb_files) MAINTAINERCLEANFILES = $(EXTRA_DIST) mscorlib.dll $(gac_assemblies) $(mdb_files): - test -f $(top_srcdir)/../mcs/class/lib/default/$@ + test -f $(mcs_topdir)/class/lib/default/$@ -rm -f $(srcdir)/$@ - cd $(srcdir) && $(LN_S) ../../../mcs/class/lib/default/$@ $@ - -cd $(srcdir) && $(LN_S) ../../../mcs/class/lib/default/$@.mdb $@.mdb + 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 \ diff --git a/runtime/net_2_0/Makefile.am b/runtime/net_2_0/Makefile.am index d2cd39cfcdd..29b9c852fac 100644 --- a/runtime/net_2_0/Makefile.am +++ b/runtime/net_2_0/Makefile.am @@ -83,11 +83,11 @@ EXTRA_DIST = $(gac_assemblies) $(corlib_DATA) $(mdb_files) MAINTAINERCLEANFILES = $(EXTRA_DIST) mscorlib.dll $(gac_assemblies) $(mdb_files): - test -f $(top_srcdir)/../mcs/class/lib/net_2_0/$@ + test -f $(mcs_topdir)/class/lib/net_2_0/$@ -rm -f $(srcdir)/$@ - cd $(srcdir) && $(LN_S) ../../../mcs/class/lib/net_2_0/$@ $@ + cd $(srcdir) && $(LN_S) $(mcs_topdir_from_srcdir)/class/lib/net_2_0/$@ $@ -all-local: $(gac_assemblies) +all-local: $(gac_assemblies) $(mdb_files) if INSTALL_2_0 install-data-local: |