x2goclient.git - master (branch) updated: 3.99.2.1-5-g647ab75 - x2go-commits

25 Jun 2012

The branch, master has been updated
       via  647ab75f420637994b0cc400590adedd106e0c28 (commit)
      from  c688541a6ef4477d3eb9eb28ca71e13a781cc69f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 647ab75f420637994b0cc400590adedd106e0c28
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Mon Jun 25 17:37:01 2012 +0200

    Provide CPPFLAGS for QMAKE_CFLAGS _and_ QMAKE_CXXFLAGS. Provide them as first build parameters.

-----------------------------------------------------------------------

Summary of changes:
 Makefile         |    4 ++--
 debian/changelog |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

The diff of changes is:

diff --git a/Makefile b/Makefile
index 965d0f2..bc98046 100755
--- a/Makefile
+++ b/Makefile
@@ -29,12 +29,12 @@ build: build_client build_plugin build_man
 
 build_client:
 	lrelease x2goclient.pro
-	mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && qmake-qt4 QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" ../x2goclient.pro
+	mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && qmake-qt4 QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" ../x2goclient.pro
 	cd $(CLIENT_DIR) && $(MAKE)
 
 build_plugin:
 	lrelease x2goclient.pro
-	mkdir -p $(PLUGIN_DIR) && cd $(PLUGIN_DIR) && X2GO_CLIENT_TARGET=plugin qmake-qt4 QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" ../x2goclient.pro
+	mkdir -p $(PLUGIN_DIR) && cd $(PLUGIN_DIR) && X2GO_CLIENT_TARGET=plugin qmake-qt4 QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" ../x2goclient.pro
 	cd $(PLUGIN_DIR) && $(MAKE)
 
 build_man:
diff --git a/debian/changelog b/debian/changelog
index 190c944..3490eb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ x2goclient (3.99.2.2-0~x2go1) UNRELEASED; urgency=low
     - Correct spelling for mis-spelled work ,,authentication''.
     - Allow QMAKE_* parameters that are needed for hardening x2goclient
       (see http://wiki.debian.org/Hardening).
+    - Provide CPPFLAGS for QMAKE_CFLAGS _and_ QMAKE_CXXFLAGS. Provide them as
+      first build parameters.
 
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Fri, 08 Jun 2012 23:17:02 +0200
 


hooks/post-receive
-- 
x2goclient.git (X2Go Client)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goclient.git" (X2Go Client).

    