From patchwork Tue Dec 6 18:57:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 1439 Return-Path: Received: from v3-1039.vlinux.de (narfation.org [79.140.41.39]) by open-mesh.org (Postfix) with ESMTPS id D64206008DA for ; Tue, 6 Dec 2011 19:57:40 +0100 (CET) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@narfation.org; dkim-adsp=pass Received: from sven-desktop.home.narfation.org (i59F6C634.versanet.de [89.246.198.52]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 324B994013; Tue, 6 Dec 2011 19:59:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=narfation.org; s=mail; t=1323197964; bh=KqPgwZV7rOsOvNDUEb3gTIuEzE0jOoSjf8GHSC1XHE8=; h=From:To:Cc:Subject:Date:Message-Id; b=VohSyXqX95BAPbgLwJayOJIyM5es5GoA2fOidto5Fd73SJNT1R/W9TCenYa32H3Gg ZD5f6uXuQnBN0DLi5wZHKlCSKJcFz69Ta24NqnX+qm8Q7QexYNizISqBYWnE7Sjp9c 9/RZ2tqR1d8a77ljJ77U2Nyd1yPDJSfy48haoOzc= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Tue, 6 Dec 2011 19:57:11 +0100 Message-Id: <1323197832-1791-1-git-send-email-sven@narfation.org> X-Mailer: git-send-email 1.7.7.3 Subject: [B.A.T.M.A.N.] [PATCH] batmand: Don't override CPPFLAGS set by user X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Dec 2011 18:57:41 -0000 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 --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 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