[apparmor] [PATCH v2 01/42] parser: Honor USE_SYSTEM make variable in libapparmor_re

Tyler Hicks tyhicks at canonical.com
Fri Mar 6 21:48:17 UTC 2015


Signed-off-by: Tyler Hicks <tyhicks at canonical.com>
Acked-by: Seth Arnold <seth.arnold at canonical.com>
---
 parser/libapparmor_re/Makefile | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/parser/libapparmor_re/Makefile b/parser/libapparmor_re/Makefile
index df205b1..bb22b5a 100644
--- a/parser/libapparmor_re/Makefile
+++ b/parser/libapparmor_re/Makefile
@@ -1,10 +1,17 @@
 # Profiling:
 #EXTRA_CFLAGS = -pg
 
+ifdef USE_SYSTEM
+  # Using the system libapparmor
+  INCLUDE_APPARMOR =
+else
+  INCLUDE_APPARMOR = -I../../libraries/libapparmor/include
+endif
+
 TARGET=libapparmor_re.a
 
 CFLAGS ?= -g -Wall -O2 ${EXTRA_CFLAGS} -std=gnu++0x
-CXXFLAGS := ${CFLAGS}
+CXXFLAGS := ${CFLAGS} ${INCLUDE_APPARMOR}
 
 ARFLAGS=-rcs
 
-- 
2.1.4




More information about the AppArmor mailing list