[X2Go-Dev] [X2Go-Commits] [x2gobroker] 02/02: Makefile: make sure that we actually append our custom CFLAGS and LDFLAGS values, even if passed in through the make command line.

[Mike Gabriel]

Hi Mihai,

why would we want to do the below???

Also note that a similar wrapper is in x2goserver:
https://code.x2go.org/gitweb?p=x2goserver.git;a=blob;f=libx2go-server-db-perl/src/libx2go-server-db-sqlite3-wrapper.c;h=927addf2ff2114cf3e1f8e263d683ace922bd092;hb=HEAD

That one probably needs similar love...

Mike

This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gobroker.
commit 4f84c06a2f2ef369d0f0ad3589a95875cfb7df1b
Date: Tue Nov 13 15:45:25 2018 +0100
Makefile: make sure that we actually append our custom CFLAGS and LDFLAGS values, even if passed in through the make command line.
---
Makefile | 6 +++---
debian/changelog | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index e572796..23e50b8 100755
--- a/Makefile
+++ b/Makefile
@@ -26,9 +26,9 @@ INSTALL_FILE=install -m 644
INSTALL_PROGRAM=install -m 755
INSTALL_SYMLINK=ln -sf
-CC ?= gcc
-CFLAGS += -fPIE
-LDFLAGS += -pie
+CC ?= gcc
+override CFLAGS += -fPIE
+override LDFLAGS += -pie
RM_FILE=rm -f
RM_DIR=rmdir -p --ignore-fail-on-non-empty
diff --git a/debian/changelog b/debian/changelog
index 9e2dbfa..d1fd388 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -119,6 +119,8 @@ x2gobroker (0.0.4.0-0x2go1) UNRELEASED; urgency=medium
- src/x2gobroker-{agent,ssh}.c: catch errors in setuid wrappers and add
general return clause to make compilers happy.
+ - Makefile: make sure that we actually append our custom CFLAGS and
+ LDFLAGS values, even if passed in through the make command line.
- Add %debug_package macro when debugging is to be enabled, hoping that it
will actually generate proper debuginfo (and -source) sub packages
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
_______________________________________________
x2go-commits mailing list
https://lists.x2go.org/listinfo/x2go-commit

--
Sent from my Jolla