summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2012-04-28 13:04:45 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2012-04-29 03:50:46 +0200
commitb1c3e8ae28fcd84c7182f4898c3250e18ed92f1a (patch)
tree5c0460d2c5016572dd11b8510e7d56b89f97bd2c /Makefile
parentbuild gbuild directly from build.pl and fix libcmis and respect GMAKE_OPTIONS (diff)
downloadcore-b1c3e8ae28fcd84c7182f4898c3250e18ed92f1a.tar.gz
core-b1c3e8ae28fcd84c7182f4898c3250e18ed92f1a.zip
make gbuild the default assumption of build.pl
this removes dmake completely out of the build for migrated modules build.pl now assumes modules to be gbuild, unless there is a prj/dmake file Change-Id: I674a036b182ee13c5ec093e83cb3d38133112d3b
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d6b06bf6932f..36434eb4e522 100644
--- a/Makefile
+++ b/Makefile
@@ -415,7 +415,8 @@ ifeq ($(DISABLE_DBCONNECTIVITY),TRUE)
cd connectivity && sed -e 's/^\(export [A-Z0-9_]*=\)\(.*\)$$/\1"\2"/' <../config_host.mk >conftmp.sh && . conftmp.sh && rm conftmp.sh && $(SOLARENV)/bin/deliver.pl
endif
cd packimages && unset MAKEFLAGS && \
- $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM)
+ $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) && \
+ make
build: build-packimages
ifeq ($(OS_FOR_BUILD),WNT)