aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-23 14:27:15 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-01 13:09:21 +0200
commitd650a0b47eadeb675e2d2cf03ad10a4dbc564971 (patch)
tree5ae7d463f5a67ddb3a35f0ab86fc225c386513a3 /nx-X11/lib
parent4cbfc5f98ea8311b0f01bcf2c219fd42c80adccd (diff)
downloadnx-libs-d650a0b47eadeb675e2d2cf03ad10a4dbc564971.tar.gz
nx-libs-d650a0b47eadeb675e2d2cf03ad10a4dbc564971.tar.bz2
nx-libs-d650a0b47eadeb675e2d2cf03ad10a4dbc564971.zip
OPTFLAGS: Properly propagate build option flags to nxcomp{,ext,shad} and the nx-X11 build scripts.
Note: - The "normal" way to inject CFLAGS (and CPPFLAGS) into nx-X11 builds is copying those options over into the variable CDEBUGFLAGS. - LDFLAGS have to be handed to nx-X11 via LOCAL_LDFLAGS. This change also includes a slight change in the nx-X11 build order. Old build order: Main Makefile: - [...] - libNX_X11 + implicitly building nxcomp + implicitly building nxcompext - [...] - nxagent + implicitly building nxcompshad - [...] New build ordner: Main Makefile: - [...] - nxcomp - setup nx-X11 build env + cd nx-X11 && make BuildEnv - nx-X11/lib/* - nxcompext - nxcompshad - [...] - nxagent - [...] Fixes ArcticaProject/nx-libs#141 Fixes X2GoBTS#84
Diffstat (limited to 'nx-X11/lib')
-rw-r--r--nx-X11/lib/X11/Imakefile38
1 files changed, 0 insertions, 38 deletions
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile
index 81a1cfd3d..1ba1e4818 100644
--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
@@ -1139,44 +1139,6 @@ includes:: ks_tables.h
CONFIGURE ?= ./configure
-#if NXLibraries
-
-$(NX_XCOMPCONFIGTARGET):
- cd ../../../nxcomp && \
- ${CONFIGURE}
-
-$(NX_XCOMPEXTCONFIGTARGET):
- cd ../../../nxcompext && \
- ${CONFIGURE}
-
-#ifdef SunArchitecture
-$(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
- ${MAKE} -C $(NX_XCOMPLIBDIR)
-
-$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET)
- ${MAKE} -C ../../../nxcompext
-
-#else
-$(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
- ${MAKE} -C $(NX_XCOMPLIBDIR)
-
-$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) $(NX_XCOMPLIBTARGET) lib$(LIBNAME).so.$(SOXLIBREV)
- ${MAKE} -C ../../../nxcompext
-
-#endif
-
-depend::
-
-lib$(LIBNAME).so.$(SOXLIBREV): $(NX_XCOMPLIBTARGET)
-
-all:: $(NX_XCOMPLIBTARGET)
-
-depend:: $(NX_XCOMPLIBTARGET)
-
-all:: $(NX_XCOMPEXTLIBTARGET)
-
-#endif
-
depend:: ks_tables.h
clean::