From adb0973d61461d0c8d47ba2ce9d6f44216f1cd2d Mon Sep 17 00:00:00 2001
From: John Johansen <john.johansen@canonical.com>
Date: Tue, 9 Nov 2010 11:33:40 -0800
Subject: [PATCH] Update Makefile to pass CFLAGS into libapparmor_re

---
 parser/Makefile                | 4 ++--
 parser/libapparmor_re/Makefile | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/parser/Makefile b/parser/Makefile
index bfbcef368..3ece5a343 100644
--- a/parser/Makefile
+++ b/parser/Makefile
@@ -49,7 +49,7 @@ ifndef CFLAGS
 CFLAGS	= -g -O2 -pipe
 
 ifdef DEBUG
-CFLAGS = -g
+CFLAGS += -pg
 endif
 endif #CFLAGS
 
@@ -235,7 +235,7 @@ check: tests
 .SILENT: $(AAREOBJECTS)
 .PHONY: $(AAREOBJECTS)
 $(AAREOBJECTS):
-	make -C $(AAREDIR) CFLAGS="$(CFLAGS)"
+	make -C $(AAREDIR) CFLAGS="$(EXTRA_CFLAGS)"
 
 .PHONY: install-rhel4
 install-rhel4: install-redhat
diff --git a/parser/libapparmor_re/Makefile b/parser/libapparmor_re/Makefile
index 4de254c24..50367d023 100644
--- a/parser/libapparmor_re/Makefile
+++ b/parser/libapparmor_re/Makefile
@@ -3,7 +3,7 @@
 
 TARGET=libapparmor_re.a
 
-CFLAGS = -g -Wall -O2 ${EXTRA_CFLAGS}
+CFLAGS ?= -g -Wall -O2 ${EXTRA_CFLAGS}
 CXXFLAGS := ${CFLAGS}
 
 ARFLAGS=-rcs