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 /Makefile.am | |
| 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 'Makefile.am')
| -rw-r--r-- | Makefile.am | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index a3d919a064e..a0ea58ebe1a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,6 +9,11 @@ DIST_SUBDIRS = libgc mono ikvm-jni docs data runtime scripts man samples support EXTRA_DIST= mono.pc.in mono.spec.in mint.pc.in +# Distribute the 'mcs' tree too +dist-hook: + test -d $(distdir)/mcs || mkdir $(distdir)/mcs + d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) distdir=$$d dist-recursive + pkgconfigdir = $(libdir)/pkgconfig if JIT_SUPPORTED pkgconfig_DATA= mono.pc mint.pc @@ -23,8 +28,6 @@ DISTCLEANFILES= mono.pc mint.pc # problems by doing the compilation in the right order. # -mcs_topdir=$(top_srcdir)/../mcs - .PHONY: bootstrap faststrap fasterstrap bootstrap-clean bootstrap-check get-monolite-latest monolite-bootstrap .PHONY: tmpinst-dir tmpinst-mcs-basic-build tmpinst-mcs-short-build tmpinst-mcs-full-build tmpinst-monolite .PHONY: mono-do-runtime-only mcs-do-basic-build mcs-do-short-build mcs-do-full-build mcs-do-clean-profiles mcs-do-run-test @@ -97,12 +100,14 @@ monolite-bootstrap: tmpinst-monolite mono-do-runtime-only $(MAKE) tmpinst-mcs-short-build $(MAKE) fasterstrap -bootstrap-world: - $(MAKE) bootstrap-clean +compiler-tests: + $(MAKE) mcs-do-clean-profiles $(MAKE) bootstrap - $(MAKE) install $(MAKE) mcs-do-compiler-tests +bootstrap-world: compiler-tests + $(MAKE) install + # internal targets tmpinst-mcs-basic-build: mcs-do-basic-build tmpinst-dir |