diff options
| author | David Karlaš <david.karlas@xamarin.com> | 2015-11-24 20:46:28 +0300 |
|---|---|---|
| committer | David Karlaš <david.karlas@xamarin.com> | 2015-11-24 20:46:28 +0300 |
| commit | fdcef13057a9c4a9bc924602c9b2b33c1da3bf63 (patch) | |
| tree | f5d45bca682a39c3946dbd9fee281e152288a4aa /main/Makefile.am | |
| parent | ee4190106f0d102c4fdce57fc3c5637cbce7b9aa (diff) | |
| parent | 07a993cf6d80660fde31099c1aca8029a3035807 (diff) | |
Merge branch 'master' into newExceptionDialog
Diffstat (limited to 'main/Makefile.am')
| -rw-r--r-- | main/Makefile.am | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/main/Makefile.am b/main/Makefile.am index 4f8c22d2a5..7420f7107e 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -18,6 +18,7 @@ all-local: vcrevision restore-packages sln_build clean: clean-local clean-local: sln_clean + cd build && $(MAKE) clean restore-packages: nuget restore @@ -108,7 +109,14 @@ apidocs: MD_LAUNCH=$(MD_LAUNCH_SETUP) $(MD_LAUNCH_EXTRA_ENV) UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 exec -a "monodevelop" $(RUNTIME) +if ENABLE_MACPLATFORM +run: run-bundle +else run: run-sgen +endif + +run-bundle: $(PROGRAM) + $(MD_LAUNCH_SETUP) $(MD_LAUNCH_EXTRA_ENV) $(MD_BIN_PATH)/MonoDevelop --no-redirect run-boehm: runmd @@ -156,7 +164,7 @@ test: cd tests && $(MAKE) test assembly=$(assembly) uitest: - cd tests && $(MAKE) uitest assembly=$(assembly) categories=$(categories) + cd tests && $(MAKE) uitest assembly=$(assembly) categories=$(categories) tests=$(tests) coverage: cd tests && $(MAKE) coverage |