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

1 files changed, 11 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index e2077ed5b..daff448cd 100644
--- a/Makefile
+++ b/Makefile
@@ -49,9 +49,7 @@ build-lite:
 
 build-full:
 # in the full case, we rely on "magic" in the nx-X11 imake-based makefiles...
-	cd nxcomp && autoconf
-	cd nxcompext && autoconf
-	cd nxcompshad && autoconf
+	cd nxcomp && autoconf && (${CONFIGURE}) && ${MAKE}
 
 	# prepare nx-X11/config/cf/nxversion.def
 	sed \
@@ -62,6 +60,16 @@ build-full:
 	    nx-X11/config/cf/nxversion.def.in \
 	    > nx-X11/config/cf/nxversion.def
 
+	# prepare Makefiles and the nx-X11 symlinking magic
+	cd nx-X11 && make BuildEnv
+
+	# build libNX_X11 and libNX_Xext prior to building
+	# nxcomp{ext,shad}.
+	cd nx-X11/lib && make
+
+	cd nxcompext && autoconf && (${CONFIGURE}) && ${MAKE}
+	cd nxcompshad && autoconf && (${CONFIGURE}) && ${MAKE}
+
 	cd nx-X11 && ${MAKE} World
 
 	cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE}