diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-18 22:00:54 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-18 22:02:15 +0300 |
| commit | 09600160cd90ef7a6bec054d51b6304ebbc2b5e0 (patch) | |
| tree | a252516b6a0da8d8f14fd5f35951986b0b38b34a /Makefile.in | |
| parent | 510737a54ad921ec6d873d1fcda20fae28d99a16 (diff) | |
Choose build.pl or make automatically in cross-build-toolset
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in index c52725dfb51a..7a1ced2b6f3c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -61,7 +61,7 @@ cross-build-toolset: jvmaccess \ bridges \ ucbhelper \ - GBUILD:comphelper \ + comphelper \ jvmfwk \ regexp \ berkeleydb \ @@ -73,20 +73,17 @@ cross-build-toolset: dictionaries \ o3tl \ basegfx \ - GBUILD:tools \ + tools \ idl \ l10ntools \ rsc \ setup_native \ icc; do \ - case $$D in \ - GBUILD:*) \ - (cd $${D#*:} && make -r -j@BUILD_MAX_JOBS@) \ - ;; \ - *) \ + if grep -q gb_Module_add_targets $$D/Module_$$D.mk 2>/dev/null; then \ + (cd $$D && make -r -j@BUILD_MAX_JOBS@) \ + else \ (cd $$D && build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ -- -P@BUILD_MAX_JOBS@ && deliver.pl) \ - ;; \ - esac; \ + fi; \ done endif |