[X2Go-Commits] [x2goclient] 02/06: Makefile: add new QMAKE_OPTS variable so that packagers can pass additional options to qmake directly.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 6274161ff239e2edc39fb616019f4bed60ee1c6f
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Aug 20 05:43:00 2017 +0200

    Makefile: add new QMAKE_OPTS variable so that packagers can pass additional options to qmake directly.
---
 Makefile         | 5 +++--
 debian/changelog | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index bde4f0c..a808689 100755
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,7 @@ MANDIR=$(SHAREDIR)/man
 MOZPLUGDIR=$(PREFIX)/lib/mozilla/plugins
 QMAKE_BINARY=qmake-qt4
 LRELEASE_BINARY=lrelease-qt4
+QMAKE_OPTS=
 
 LDFLAGS+=-lldap -lcups -lX11 -lXpm
 
@@ -37,12 +38,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}" ../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
 	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}" ../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
 	cd $(PLUGIN_DIR) && $(MAKE)
 
 build_pluginprovider:
diff --git a/debian/changelog b/debian/changelog
index 652c1ec..3cf1b3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -161,6 +161,8 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
       leading to connections like $REMOTE_HOST:$PROXY_PORT, which is certainly
       wrong. Fetch the inferred port value and set this instead, fixing this
       issue.
+    - Makefile: add new QMAKE_OPTS variable so that packagers can pass
+      additional options to qmake directly.
 
   [ Oleksandr Shneyder ]
   * New upstream version (4.1.0.1):

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git