diff mbox

batmand: Don't override CPPFLAGS set by user

Message ID 1323197832-1791-1-git-send-email-sven@narfation.org (mailing list archive)
State Accepted, archived
Commit 9cd7382f815fbebe25381d5ad5da4cd5074f20cc
Headers

Commit Message

Sven Eckelmann Dec. 6, 2011, 6:57 p.m. UTC 
  Users or build servers may want to enable preprocessor specific options like
-D_FORTIFY_SOURCE=2 that are usually placed in CPPFLAGS. The batmand makefile
should not override these options to add own preprocessor variables.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

elektra Dec. 6, 2011, 7:53 p.m. UTC | #1 
> Users or build servers may want to enable preprocessor specific options
>  like -D_FORTIFY_SOURCE=2 that are usually placed in CPPFLAGS. The batmand
>  makefile should not override these options to add own preprocessor
>  variables.
> 
> Signed-off-by: Sven Eckelmann <sven@narfation.org>

Applied in 9cd7382.

Thanks!

Cheers,
Elektra
Sven Eckelmann Dec. 7, 2011, 7:20 a.m. UTC | #2 
On Tuesday 06 December 2011 20:53:53 elektra wrote:
> > Users or build servers may want to enable preprocessor specific options
> > 
> >  like -D_FORTIFY_SOURCE=2 that are usually placed in CPPFLAGS. The
> >  batmand makefile should not override these options to add own
> >  preprocessor variables.
> > 
> > Signed-off-by: Sven Eckelmann <sven@narfation.org>
> 
> Applied in 9cd7382.

It would be nice not to remove my authorship in git. It is enough to just save
the mail in a textfile (mbox) and run `git am patch123.mbox` or `git am -s
patch123.mbox` (this adds your Signed-off-by after my Signed-of-by). Now it
looks [1] like you are the author and committer of the patch.... but you
should only be the committer.

Kind regards,
	Sven

[1] http://git.open-mesh.org/?p=batmand.git;a=commitdiff;h=9cd7382f815fbebe25381d5ad5da4cd5074f20cc
elektra Dec. 7, 2011, 12:40 p.m. UTC | #3 
Hi -

thanks for the tip!
 
Cheers,
Elektra
diff mbox

Patch

diff --git a/Makefile b/Makefile
index 346b14a..65e0cf2 100755
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,7 @@  MANPAGE = man/batmand.8
 
 # batmand flags and options
 CFLAGS +=	-pedantic -Wall -W -std=gnu99 -MD
-CPPFLAGS =	-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA $(NO_POLICY_ROUTING)
+CPPFLAGS +=	-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA $(NO_POLICY_ROUTING)
 LDLIBS +=	-lpthread
 
 # disable verbose output