This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit e62cf4f870fe0d682c9fdb93ddb8b962eaedcb3a Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Aug 20 06:52:55 2017 +0200 Makefile: qmake seems to act weird if QMAKE_C(XX)FLAGS starts with a space followed by additional non-whitespace characters. Refactor the variables a bit to work around this issue. --- Makefile | 6 ++++-- debian/changelog | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a808689..55add75 100755 --- a/Makefile +++ b/Makefile @@ -27,6 +27,8 @@ MOZPLUGDIR=$(PREFIX)/lib/mozilla/plugins QMAKE_BINARY=qmake-qt4 LRELEASE_BINARY=lrelease-qt4 QMAKE_OPTS= +QMAKE_CFLAGS=$(CPPFLAGS) $(CFLAGS) +QMAKE_CXXFLAGS=$(CPPFLAGS) $(CXXFLAGS) LDFLAGS+=-lldap -lcups -lX11 -lXpm @@ -38,12 +40,12 @@ build: build_man build_pluginprovider build_client: $(LRELEASE_BINARY) x2goclient.pro - mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && $(QMAKE_BINARY) QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" $(QMAKE_OPTS) ../x2goclient.pro + mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && $(QMAKE_BINARY) QMAKE_CFLAGS="${QMAKE_CFLAGS}" QMAKE_CXXFLAGS="${QMAKE_CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" $(QMAKE_OPTS) ../x2goclient.pro cd $(CLIENT_DIR) && $(MAKE) build_plugin: $(LRELEASE_BINARY) x2goclient.pro - mkdir -p $(PLUGIN_DIR) && cd $(PLUGIN_DIR) && X2GO_CLIENT_TARGET=plugin $(QMAKE_BINARY) QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" $(QMAKE_OPTS) ../x2goclient.pro + mkdir -p $(PLUGIN_DIR) && cd $(PLUGIN_DIR) && X2GO_CLIENT_TARGET=plugin $(QMAKE_BINARY) QMAKE_CFLAGS="${QMAKE_CFLAGS}" QMAKE_CXXFLAGS="${QMAKE_CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" $(QMAKE_OPTS) ../x2goclient.pro cd $(PLUGIN_DIR) && $(MAKE) build_pluginprovider: diff --git a/debian/changelog b/debian/changelog index 88ca0d5..31bdab8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -168,6 +168,9 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium we're done with it. - src/sessionbutton.cpp: only append "XDM@" string to server text if a direct XDMCP session was requested. Issue automatically found by GCC. + - Makefile: qmake seems to act weird if QMAKE_C(XX)FLAGS starts with a + space followed by additional non-whitespace characters. Refactor the + variables a bit to work around this issue. * x2goclient.spec: - Respect %{optflags} and pass QMAKE_STRIP=: to fix missing debug info issues. -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git