aboutsummaryrefslogtreecommitdiff
path: root/nxcomp/Makefile.in
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 /nxcomp/Makefile.in
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 'nxcomp/Makefile.in')
-rw-r--r--nxcomp/Makefile.in6
1 files changed, 4 insertions, 2 deletions
diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in
index 759ab6a4f..ee12c3dbb 100644
--- a/nxcomp/Makefile.in
+++ b/nxcomp/Makefile.in
@@ -41,6 +41,8 @@ CXXFLAGS = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \
CXXINCLUDES =
CXXDEFINES =
+CPPFLAGS = @CPPFLAGS@
+
#
# C programs have their own CFLAGS.
#
@@ -87,9 +89,9 @@ DEPENDINCLUDES = -I/usr/include/c++ -I/usr/include/g++ -I/usr/include/g++-3
.SUFFIXES: .cpp.c
.cpp.o:
- $(CXX) -c $(CXXFLAGS) $(CXXINCLUDES) $(CXXDEFINES) $<
+ $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CXXINCLUDES) $(CXXDEFINES) $<
.c.o:
- $(CC) -c $(CCFLAGS) $(CCINCLUDES) $(CCDEFINES) $<
+ $(CC) -c $(CPPFLAGS) $(CCFLAGS) $(CCINCLUDES) $(CCDEFINES) $<
LIBRARY = Xcomp