m + doc PASSPHRASE_STAR_CHAR, PASSPHRASE_TEXT_EMPTY and PASSPHRASE_TEXT_NOT_EMPTY1427220157

Signed-off-by: Mattias Andrée <maandree@operamail.com>

1 files changed, 12 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 8b233a6..544e889 100644
--- a/Makefile
+++ b/Makefile
@@ -31,8 +31,8 @@ PKGNAME ?= libpassphrase
 # Options with which to compile the library
 OPTIONS ?= 
 # PASSPHRASE_ECHO:       Do not hide the passphrase
-# PASSPHRASE_STAR:       Use '*' for each character instead of no echo
-# PASSPHRASE_TEXT:       Use '(empty)' and '(not empty)' instead of no echo
+# PASSPHRASE_STAR:       Use "*" for each character instead of no echo
+# PASSPHRASE_TEXT:       Use "(empty)" and "(not empty)" instead of no echo
 # PASSPHRASE_REALLOC:    Soften security by using `realloc`
 # PASSPHRASE_MOVE:       Enable move of point
 # PASSPHRASE_INSERT:     Enable insert mode
@@ -43,6 +43,15 @@ OPTIONS ?=
 # DEFAULT_INSERT:        Use insert mode as default
 # PASSPHRASE_INVALID:    Prevent duplication of non-initialised memory
 
+# Text to use instead of "*"
+PASSPHRASE_STAR_CHAR      ?= \*
+# Text to use instead of "(empty)"
+PASSPHRASE_TEXT_EMPTY     ?= (empty)
+# Text to use instead of "(not empty)"
+PASSPHRASE_TEXT_NOT_EMPTY ?= (not empty)
+
+QUOTED_OPTIONS = PASSPHRASE_STAR_CHAR PASSPHRASE_TEXT_EMPTY PASSPHRASE_TEXT_NOT_EMPTY
+
 
 # Optimisation settings for C code compilation
 OPTIMISE ?= -Os
@@ -61,7 +70,7 @@ WARN = -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self -Wmissing-include
 # The C standard for C code compilation
 STD = gnu99
 # C preprocessor flags
-CPPFLAGS_ = $(foreach D, $(OPTIONS), -D'$(D)=1')
+CPPFLAGS_ = $(foreach D, $(OPTIONS), -D'$(D)=1') $(foreach D, $(QUOTED_OPTIONS), -D'$(D)="$($(D))"')
 # C compiling flags
 CFLAGS_ = -std=$(STD) $(WARN)
 # Linking flags