From 9ddc2fc79445072e2112a84ad2f83901855b4efe Mon Sep 17 00:00:00 2001 From: Thulinma Date: Fri, 17 Jan 2014 19:31:06 +0100 Subject: [PATCH] Improved handling of CPPFLAGS option. --- Makefile | 3 ++- README | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0d57b539..a3b978ec 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,8 @@ ifeq ($(PACKAGE_VERSION),Unknown) $(warning Version is unknown - consider creating a VERSION file or fixing your git setup.) endif -CPPFLAGS = -Wall -funsigned-char -g -O2 -fPIC -DDEBUG="$(DEBUG)" -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" +CPPFLAGS = -Wall -g -O2 -fPIC +override CPPFLAGS += -funsigned-char -DDEBUG="$(DEBUG)" -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" LDLIBS = -lcrypto diff --git a/README b/README index 485e9e4d..ed78f84a 100644 --- a/README +++ b/README @@ -30,7 +30,7 @@ The makefile will listen to the following variables: includedir Directory to install headers to. Defaults to $(prefix)/include libdir Directory to install libraries to. Defaults to $(exec_prefix)/lib DESTDIR Global prefix that will be put in front of any and all other file paths. - CPPFLAGS Flags for compiling object files. Defaults to -Wall -g -O2 -fPIC -DDEBUG="$(DEBUG)" -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" + CPPFLAGS Flags for compiling object files. Defaults to -Wall -g -O2 -fPIC LDLIBS Libraries to include. Defaults to -lcrypto Use "make var1=val1 var2=val2" to set these. For example: