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-07-01 13:09:21 +0200 |
| commit | d650a0b47eadeb675e2d2cf03ad10a4dbc564971 (patch) | |
| tree | 5ae7d463f5a67ddb3a35f0ab86fc225c386513a3 /nxcompext | |
| parent | 4cbfc5f98ea8311b0f01bcf2c219fd42c80adccd (diff) | |
| download | nx-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 'nxcompext')
| -rw-r--r-- | nxcompext/Makefile.in | 6 | ||||
| -rw-r--r-- | nxcompext/configure.in | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in index dd18c8053..415ffabb1 100644 --- a/nxcompext/Makefile.in +++ b/nxcompext/Makefile.in @@ -34,6 +34,8 @@ CXXFLAGS = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \ CXXINCLUDES = -I. -I../nxcomp CXXDEFINES = +CPPFLAGS = @CPPFLAGS@ + CC = @CC@ CCFLAGS = @CFLAGS@ @X_CFLAGS@ @DEFS@ \ -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ @@ -78,9 +80,9 @@ DEPENDINCLUDES = -I/usr/include/c++ -I/usr/include/g++ -I/usr/include/g++-3 .SUFFIXES: .cpp.c .cpp.o: - $(CXX) -c $(CXXFLAGS) $(CXXINCLUDES) $< + $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CXXINCLUDES) $< .c.o: - $(CC) -c $(CCFLAGS) $(CCINCLUDES) $< + $(CC) -c $(CPPFLAGS) $(CCFLAGS) $(CCINCLUDES) $< LIBRARY = Xcompext diff --git a/nxcompext/configure.in b/nxcompext/configure.in index 6078851b4..70bb9d121 100644 --- a/nxcompext/configure.in +++ b/nxcompext/configure.in @@ -10,8 +10,12 @@ AC_SUBST(pkgconfigdir) dnl Reset default compilation flags. -CXXFLAGS="$CXXFLAGS -O3" -CFLAGS="$CFLAGS -O3" +if test "x$CXXFLAGS" = "x"; then + CXXFLAGS="-O3" +fi +if test "x$CFLAGS" == "x"; then + CFLAGS="-O3" +fi dnl Reset default linking directives. |