Use LTTngUSTLogger logger plugin in logtest regression test

[deliverable/titan.core.git] / Makefile.cfg

diff --git a/Makefile.cfg b/Makefile.cfg
index 3d864981c084290401b957a8caa509436c834bca..edbc42e4476157431d25622fc7165d0a0d58f46d 100644 (file)
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -58,6 +58,11 @@ DEBUG := no
 # Set it to 'yes' to generate coverage data (requires DEBUG=yes)
 COVERAGE := no
 
+# Set it to 'yes' to enable extra features for the debugger UI in single mode
+# (this requires an extra library when linking the generated code).
+# Set it to 'no' to use a simplified debugger UI.
+ADVANCED_DEBUGGER_UI := no
+
 # Your platform. Allowed values: SOLARIS, SOLARIS8, LINUX, FREEBSD,
 # WIN32. Decided automagically if not defined (recommended).
 # PLATFORM :=
@@ -88,11 +93,7 @@ JNI := yes
 
 # Path of the Java Developement Kit installation
 # (must be at least version  1.5.0_10)
-<<<<<<< HEAD
-JDKDIR := /usr/lib/jvm/default-java 
-=======
 JDKDIR := /usr/lib/jvm/default-java
->>>>>>> 318d000115c0c01e0d7077166c13a9ab3918e287
 
 # Path of OpenSSL installation: (always required)
 OPENSSL_DIR := default
@@ -102,7 +103,7 @@ XMLDIR := default
 
 # Flags for the C(++) preprocessor:
 # Prevent a warning about yyinput being defined but not used
-CPPFLAGS := -DYY_NO_INPUT
+CPPFLAGS += -DYY_NO_INPUT
 
 # Flags shared between C and C++
 COMPILERFLAGS := -Wall
@@ -113,10 +114,10 @@ COMPILERFLAGS := -Wall
 
 # Flags for the C compiler.
 # std=gnu9x shuts up warnings about long long and variadic macros
-CCFLAGS = $(COMPILERFLAGS) -std=gnu9x
+CCFLAGS += $(COMPILERFLAGS) -std=gnu9x
 
 # Flags for the C++ compiler:
-CXXFLAGS = $(COMPILERFLAGS) -Wno-long-long
+CXXFLAGS += $(COMPILERFLAGS) -Wno-long-long
 
 # The command for maintaining static libraries:
 AR := ar
@@ -127,7 +128,7 @@ AR := ar
 LD = $(CXX) -shared
 
 # Flags for linking binary executables (e.g. for profiling):
-LDFLAGS = $(MINGW)
+LDFLAGS += $(MINGW)
 
 # The command for removing symbol table from the executables:
 STRIP := strip
@@ -219,6 +220,10 @@ ifeq ($(COVERAGE), yes)
   LDFLAGS += -fprofile-arcs -ftest-coverage -lgcov
 endif
 
+ifeq ($(ADVANCED_DEBUGGER_UI), yes)
+  CPPFLAGS += -DADVANCED_DEBUGGER_UI
+endif
+
 # Directory which contains the code for POSIX regular expression handling.
 # It is needed on platforms where the system's libc does not support POSIX
 # regexps. This is the case for Mingw.