Do parallel builds for Ubuntu packages

Make the builds faster as we now run them often via Travis.

diff --git a/contrib/packages/deb/ubuntu-trusty/debian/rules b/contrib/packages/deb/ubuntu-trusty/debian/rules
index 1ddd06ed859843a18c00d30d2030661a1ca26dd8..a84e86b9ef3040e91af98c2fba54209e889adb5a 100755 (executable)
--- 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 7509e7b4d0e41dc21fedaf1870833e24dbe778c4..3d58d282a72819319e01cae02fb195ff0c03d188 100644 (file)
--- 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