summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2019-01-21 16:29:20 +0100
committerPierre Ossman <ossman@cendio.se>2019-01-21 16:48:35 +0100
commit9f90b6d568742aa514005e6a3fd955a95ecdd109 (patch)
treeea1e19de8c84685f8751e4eeee8927739c0348d2
parentdfccb170e6262ed278e955fa7e2907c71b4239da (diff)
downloadtigervnc-9f90b6d568742aa514005e6a3fd955a95ecdd109.tar.gz
tigervnc-9f90b6d568742aa514005e6a3fd955a95ecdd109.zip
Do parallel builds for Ubuntu packages
Make the builds faster as we now run them often via Travis.
-rwxr-xr-xcontrib/packages/deb/ubuntu-trusty/debian/rules8
-rw-r--r--contrib/packages/deb/ubuntu-xenial/debian/rules6
2 files changed, 9 insertions, 5 deletions
diff --git a/contrib/packages/deb/ubuntu-trusty/debian/rules b/contrib/packages/deb/ubuntu-trusty/debian/rules
index 1ddd06ed..a84e86b9 100755
--- a/contrib/packages/deb/ubuntu-trusty/debian/rules
+++ b/contrib/packages/deb/ubuntu-trusty/debian/rules
@@ -10,6 +10,8 @@ LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
export CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+NUMJOBS := -j$(shell nproc)
+
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -58,7 +60,7 @@ fltk-stamp:
(cd fltk-*;DSOFLAGS="$(filter-out -fPIE -pie,$(LDFLAGS))" \
./configure --enable-shared=no --enable-cairo --enable-cp936 \
--with-optim="$(CFLAGS) $(XCFLAGS)" --libdir=$(libdir))
- make -C fltk-*
+ make $(NUMJOBS) -C fltk-*
touch fltk-stamp
configure: config-stamp
@@ -145,8 +147,8 @@ build-arch-stamp:
# Add here command to compile/build the package.
# Build first things.
# Build Xvnc
- make LDFLAGS="-lpng"
- (cd unix/xserver;make)
+ make $(NUMJOBS) LDFLAGS="-lpng"
+ make $(NUMJOBS) -C unix/xserver
touch build-arch-stamp
diff --git a/contrib/packages/deb/ubuntu-xenial/debian/rules b/contrib/packages/deb/ubuntu-xenial/debian/rules
index 7509e7b4..3d58d282 100644
--- a/contrib/packages/deb/ubuntu-xenial/debian/rules
+++ b/contrib/packages/deb/ubuntu-xenial/debian/rules
@@ -10,6 +10,8 @@ LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
export CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+NUMJOBS := -j$(shell nproc)
+
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -124,8 +126,8 @@ build-arch-stamp:
# Add here command to compile/build the package.
# Build first things.
# Build Xvnc
- make LDFLAGS="-lpng"
- (cd unix/xserver;make)
+ make $(NUMJOBS) LDFLAGS="-lpng"
+ make $(NUMJOBS) -C unix/xserver
touch build-arch-stamp