From 236797e6147c591147d083aabd4ef0ce4d030f87 Mon Sep 17 00:00:00 2001 From: Ivica Ico Bukvic <ico@vt.edu> Date: Tue, 18 Mar 2014 17:39:25 -0400 Subject: [PATCH] improved installer to avoid install of Gem libraries when doing incremental install (should significantly shorten incremental installs) --- externals/Makefile | 8 ++++++-- l2ork_addons/tar_em_up.sh | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/externals/Makefile b/externals/Makefile index 60a27f0cd..0208fb7dc 100644 --- a/externals/Makefile +++ b/externals/Makefile @@ -145,8 +145,12 @@ else LIB_TARGETS += hid endif else - # GNU/Linux, BSD, IRIX, etc. - LIB_TARGETS += gem hid pdp gem2pdp iem16 + # GNU/Linux, BSD, IRIX, etc. (we use exported variable INCREMENTAL to avoid rebuilding entire Gem lib that takes a long time to compile) + ifeq ($(INCREMENTAL),yes) + LIB_TARGETS += hid pdp gem2pdp iem16 + else + LIB_TARGETS += gem hid pdp gem2pdp iem16 + endif endif endif diff --git a/l2ork_addons/tar_em_up.sh b/l2ork_addons/tar_em_up.sh index 5d5cba095..195da21a0 100755 --- a/l2ork_addons/tar_em_up.sh +++ b/l2ork_addons/tar_em_up.sh @@ -202,6 +202,7 @@ then rm Gem.pd_linux aclocal ./autogen.sh + export INCREMENTAL="" #elif [ $full -eq 3 ] #then # echo "Since pd-l2ork relies on a unique version of cwiid library, we will need to install it to make disis_wiimote external work properly. YOU SHOULD REMOVE EXISTING CWIID LIBRARIES PRIOR TO RUNNING THIS INSTALL... No worries though, L2Ork version is fully backwards compatible while also offering unique features like full extension support including the passthrough mode. To install cwiid library go to <pd-l2ork-root-git-folder>/l2ork-addons/cwiid/ folder and install it using the usual:" @@ -227,6 +228,7 @@ then # ./autogen.sh else cd Gem/ + export INCREMENTAL="yes" fi cd ../packages/linux_make if [ $full -gt 1 -o $deb -eq 2 ] -- GitLab