From a1e9abc7841adec8403c4bba6e394b5540ad8e78 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
      - nxcompext
      - nxcompshad
      - nx-X11/lib/*
      - [...]
      - nxagent
      - [...]

 Fixes ArcticaProject/nx-libs#141
 Fixes X2GoBTS#84
---
 nx-X11/programs/Xserver/Imakefile | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

(limited to 'nx-X11/programs')

diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index 0d820fad2..50031217e 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -455,27 +455,7 @@ NX_XSHADOWLIBNAME   = cygXcompshad.dll
 NX_XSHADOWLIBNAME   = libXcompshad.so
 #endif
 
-NX_XSHADOWLIBDIR    = $(XTOP)/../nxcompshad
-NX_XSHADOWLIBTARGET = $(NX_XSHADOWLIBDIR)/$(NX_XSHADOWLIBNAME)
-NX_XSHADOWCONFIGTARGET = $(NX_XSHADOWLIBDIR)/config.status
-
-CONFIGURE ?= ./configure
-
-$(NX_XSHADOWCONFIGTARGET):
-	cd $(NX_XSHADOWLIBDIR) && \
-	${CONFIGURE}
-
-#ifdef SunArchitecture
-$(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET)
-	cd $(NX_XSHADOWLIBDIR) && \
-	${MAKE}
-#else
-$(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET)
-	cd $(NX_XSHADOWLIBDIR) && \
-	rm -f *.o && ${MAKE}
-#endif
-
-ServerTarget(nxagent,$(NX_XSHADOWLIBTARGET) $(NXAGENTDIRS),$(NXAGENTOBJS), \
+ServerTarget(nxagent,$(NXAGENTDIRS),$(NXAGENTOBJS), \
         $(LIBCWRAPPER) $(NXAGENTLIBS) $(LOADABLEEXTS),$(NXAGENTSYSLIBS) $(NXAGENTNXLIBS))
 
 /*
-- 
cgit v1.2.3