diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-23 14:27:15 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-30 22:41:42 +0200 |
| commit | a1e9abc7841adec8403c4bba6e394b5540ad8e78 (patch) | |
| tree | 5ae7d463f5a67ddb3a35f0ab86fc225c386513a3 /nx-X11/Makefile | |
| parent | 4cbfc5f98ea8311b0f01bcf2c219fd42c80adccd (diff) | |
| download | nx-libs-a1e9abc7841adec8403c4bba6e394b5540ad8e78.tar.gz nx-libs-a1e9abc7841adec8403c4bba6e394b5540ad8e78.tar.bz2 nx-libs-a1e9abc7841adec8403c4bba6e394b5540ad8e78.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
- nxcompext
- nxcompshad
- nx-X11/lib/*
- [...]
- nxagent
- [...]
Fixes ArcticaProject/nx-libs#141
Fixes X2GoBTS#84
Diffstat (limited to 'nx-X11/Makefile')
| -rw-r--r-- | nx-X11/Makefile | 16 |
1 files changed, 10 insertions, 6 deletions
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 |