aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@canonical.com>2010-06-13 13:11:47 -0400
committerSteven Rostedt <rostedt@goodmis.org>2010-06-15 17:47:10 -0400
commit3c4cb6c3330b6ec2a26918c54d62b62fe60ed0a1 (patch)
tree3e397ed054a34de985a804749d8d44bf1a60fc41
parentb4e117e30bc3ed3e30d49b89a0c3c3a796ad9a4b (diff)
trace-cmd: append to CFLAGS instead of being overriden
Most package builders apply their own CFLAGS, often set during the make invocation. The trace-cmd internal CFLAGS is overriden in this case. Make sure the important flags are appended. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> LKML-Reference: <1276449108-21328-1-git-send-email-chase.douglas@canonical.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r--Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 1eebd1c..662a306 100644
--- a/Makefile
+++ b/Makefile
@@ -183,7 +183,11 @@ KERNELSHARK_VERSION = $(KS_VERSION).$(KS_PATCHLEVEL).$(KS_EXTRAVERSION)
183 183
184INCLUDES = -I. -I/usr/local/include $(CONFIG_INCLUDES) 184INCLUDES = -I. -I/usr/local/include $(CONFIG_INCLUDES)
185 185
186CFLAGS = -g -Wall $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ) 186# Set compile option CFLAGS if not set elsewhere
187CFLAGS ?= -g -Wall
188
189# Append required CFLAGS
190override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ)
187 191
188ifeq ($(VERBOSE),1) 192ifeq ($(VERBOSE),1)
189 Q = 193 Q =