Improve handling of CFLAGS and LDFLAGS make variables

The Makefile now uses 3 flavors of C/LDFLAGS variables: LOCAL_*, LI_* and
the plain ones.

LOCAL_* are used for mandatory local flags, like -std=C++98 and such,
LI_* are reserved for special "local-install" flags (set by the
super-repository). Plain C/LDFLAGS can be set by the user at make-time as
usual.

diff --git a/test/Makefile b/test/Makefile
index ea44f746309ead5fa5491974bfdf3fb0f66d3829..b9ae44899ea7efbcbaae1042d9d2b5532d1fe168 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,7 +1,6 @@
 
-CINCPATH = -isystem include
-CFLAGS += -std=c++98 -Wall -pedantic
-LDFLAGS = -lboost_unit_test_framework
+LOCAL_CFLAGS = -std=c++98 -Wall -pedantic -isystem include
+LOCAL_LDFLAGS = -lboost_unit_test_framework
 
 TESTPRG = test_suite
 TESTCMD = ./$(TESTPRG) --detect_memory_leak=1 --report_level=short \
@@ -18,7 +17,8 @@ OBJS = $(SOURCES:.cpp=.o)
 
 
 
-ALL_CFLAGS = $(CFLAGS) $(CINCPATH)
+ALL_CFLAGS = $(LOCAL_CFLAGS) $(LI_CFLAGS) $(CFLAGS)
+ALL_LDFLAGS = $(LOCAL_LDFLAGS) $(LI_LDFLAGS) $(LDFLAGS)
 
 ifdef RELEASE
 ALL_CFLAGS += -O3 -NDEBUG
@@ -82,7 +82,7 @@ endif
 
 
 $(TESTPRG): $(OBJS)
-       $(NICE_LINK) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $^
+       $(NICE_LINK) $(ALL_LDFLAGS) -o $@ $^
 
 $(OBJS): include