aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@medozas.de>2015-02-09 15:38:59 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-09 15:39:54 +0100
commit6101bd9564d6334dea7c0de778536e3fe1a5e9b9 (patch)
tree6c52fb48412202e23cb43766236a122855002365 /nx-X11/lib
parent9f4b494fa49db53a440f544246d6922dbd0c4684 (diff)
downloadnx-libs-6101bd9564d6334dea7c0de778536e3fe1a5e9b9.tar.gz
nx-libs-6101bd9564d6334dea7c0de778536e3fe1a5e9b9.tar.bz2
nx-libs-6101bd9564d6334dea7c0de778536e3fe1a5e9b9.zip
Description: Enable parallel make (031_nx-X11_parallel-make.full.patch).
Restore ability to build things in parallel. (${MAKE} must always appear in the rule directly, and not be hidden through expansions of other variables to get this to work.)
Diffstat (limited to 'nx-X11/lib')
-rw-r--r--nx-X11/lib/X11/Imakefile18
1 files changed, 8 insertions, 10 deletions
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile
index 24319499c..cad223f1c 100644
--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
@@ -1161,25 +1161,23 @@ $(NX_XCOMPEXTCONFIGTARGET):
#ifdef SunArchitecture
$(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
- cd $(NX_XCOMPLIBDIR) && \
- gmake
+ ${MAKE} -C $(NX_XCOMPLIBDIR)
$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET)
- cd ../../../nxcompext && \
- gmake
+ ${MAKE} -C ../../../nxcompext
#else
$(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
- cd $(NX_XCOMPLIBDIR) && \
- make
+ ${MAKE} -C $(NX_XCOMPLIBDIR)
-$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET)
- cd ../../../nxcompext && \
- make
+$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) $(NX_XCOMPLIBTARGET) lib$(LIBNAME).so.$(SOXLIBREV)
+ ${MAKE} -C ../../../nxcompext
#endif
-depend:: $(NX_XCOMPLIBTARGET)
+depend::
+
+lib$(LIBNAME).so.$(SOXLIBREV): $(NX_XCOMPLIBTARGET)
all:: $(NX_XCOMPLIBTARGET)