From d650a0b47eadeb675e2d2cf03ad10a4dbc564971 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Thu, 23 Jun 2016 14:27:15 +0200
Subject: 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
---
 nx-X11/Makefile | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'nx-X11/Makefile')

diff --git a/nx-X11/Makefile b/nx-X11/Makefile
index cb8c86b2b..1096e62cf 100644
--- a/nx-X11/Makefile
+++ b/nx-X11/Makefile
@@ -39,6 +39,15 @@ World:
 	@echo ""
 	@date
 	@echo ""
+	if [ ! -f xmakefile ]; then ${MAKE} ${MFLAGS} BuildEnv; fi
+	${MAKE} ${MAKE_OPTS} $(MFLAGS) $(WORLDOPTS) World
+	@echo ""
+	@date
+	@echo ""
+	@echo Full build of $(RELEASE) complete.
+	@echo ""
+
+BuildEnv:
 	@if [ -f xmakefile ]; then \
 	    ${MAKE} ${MAKE_OPTS} -k distclean || \
 	    ${MAKE} ${MAKE_OPTS} -k clean || \
@@ -52,12 +61,7 @@ World:
 	${MAKE} ${MAKE_OPTS} $(MFLAGS) BOOTSTRAPSUBDIRS= clean
 	${MAKE} ${MAKE_OPTS} $(MFLAGS) includes
 	${MAKE} ${MAKE_OPTS} $(MFLAGS) depend
-	${MAKE} ${MAKE_OPTS} $(MFLAGS) $(WORLDOPTS) World
-	@echo ""
-	@date
-	@echo ""
-	@echo Full build of $(RELEASE) complete.
-	@echo ""
+
 
 .PRECIOUS: Makefile
 
-- 
cgit v1.2.3