diff options
author | Raja R Harinath <harinath@hurrynot.org> | 2007-05-07 13:14:57 +0400 |
---|---|---|
committer | Raja R Harinath <harinath@hurrynot.org> | 2007-05-07 13:14:57 +0400 |
commit | c13db829c2c0b74013d8d0f25428d3f804dfa4db (patch) | |
tree | afed3f0e53b328e12b7a9a0f5904e1e310b159c5 /runtime | |
parent | 676b57792a49c9cf39f2f819cbfe7ce2484db875 (diff) |
Fix parallel make.
* runtime/Makefile.am (test-support-file): Remove. Move rules ...
(_tmpinst/bin/mcs, _tmpinst/bin/gmcs, _tmpinst/bin/ilasm): ... here.
svn path=/trunk/mono/; revision=76812
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/Makefile.am | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 29ae8f4372e..439688e79f4 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -108,24 +108,27 @@ $(tmpinst)/bin/mono: mono-wrapper etc/mono/config $(mkinstalldirs) $(tmpinst)/bin cp mono-wrapper $@ -$(tmpinst)/bin/mcs: - $(MAKE) test-support-file target=$@ file=class/lib/default/mcs.exe - -$(tmpinst)/bin/gmcs: - $(MAKE) test-support-file target=$@ file=gmcs/gmcs.exe - -$(tmpinst)/bin/ilasm: - $(MAKE) test-support-file target=$@ file=ilasm/ilasm.exe +$(tmpinst)/bin/mcs: $(tmpinst)/bin/mono Makefile + echo '#! /bin/sh' > $@ ; \ + r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \ + echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/default/mcs.exe"'" "$$@"' >> $@ ; \ + chmod +x $@ + +$(tmpinst)/bin/gmcs: $(tmpinst)/bin/mono Makefile + echo '#! /bin/sh' > $@ ; \ + r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \ + echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/gmcs/gmcs.exe"'" "$$@"' >> $@ ; \ + chmod +x $@ + +$(tmpinst)/bin/ilasm: $(tmpinst)/bin/mono Makefile + echo '#! /bin/sh' > $@ ; \ + r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \ + echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/ilasm/ilasm.exe"'" "$$@"' >> $@ ; \ + chmod +x $@ test-support-files: $(TEST_SUPPORT_FILES) @: -test-support-file: $(tmpinst)/bin/mono - test -n '$(target)$(file)' - echo '#! /bin/sh' > $(target) - r=`pwd`; m=`cd $(mcs_topdir) && pwd`; echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/$(file)"'" "$$@"' >> $(target) - chmod +x $(target) - # the 'cygnus' option also disables the default 'distdir:' target, which we _do_ want MYDISTFILES = $(DIST_COMMON) distdir: $(MYDISTFILES) |