From 227f83163908a1e2bfb783a7500263f5c204cb36 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 28 May 2011 12:00:34 -0400
Subject: [PATCH] cc.mk: move debug.mk out of end Makefiles

Since we always want debug.mk whenever we include cc.mk, move the include
out of the Makefiles and into cc.mk itself.  This also fixes an include
order bug in rc/Makefile where debug.mk is included before cc.mk and
breaks the default CFLAGS setup in cc.mk.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 mk/cc.mk              | 2 ++
 src/libeinfo/Makefile | 1 -
 src/librc/Makefile    | 1 -
 src/rc/Makefile       | 1 -
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/mk/cc.mk b/mk/cc.mk
index 4192b345..ceb82f19 100644
--- a/mk/cc.mk
+++ b/mk/cc.mk
@@ -31,3 +31,5 @@ _CC_FLAGS_SH=	for f in ${_CCFLAGS}; do \
 		done;
 _CC_FLAGS:=	$(shell ${_CC_FLAGS_SH})
 CFLAGS+=	${_CC_FLAGS}
+
+include ${MK}/debug.mk
diff --git a/src/libeinfo/Makefile b/src/libeinfo/Makefile
index b93b5e50..ec756b47 100644
--- a/src/libeinfo/Makefile
+++ b/src/libeinfo/Makefile
@@ -9,5 +9,4 @@ CPPFLAGS+=		-I../includes
 MK=			../../mk
 include ${MK}/lib.mk
 include ${MK}/cc.mk
-include ${MK}/debug.mk
 include ${MK}/termcap.mk
diff --git a/src/librc/Makefile b/src/librc/Makefile
index 574aa2af..963fb415 100644
--- a/src/librc/Makefile
+++ b/src/librc/Makefile
@@ -12,7 +12,6 @@ CPPFLAGS+=	-I../includes
 MK=		../../mk
 include ${MK}/lib.mk
 include ${MK}/cc.mk
-include ${MK}/debug.mk
 
 # Massage our header file for our dirs
 SED_CMD=	-e 's:@PREFIX@:${PREFIX}:g'
diff --git a/src/rc/Makefile b/src/rc/Makefile
index 5397415d..fc6b9aa8 100644
--- a/src/rc/Makefile
+++ b/src/rc/Makefile
@@ -36,7 +36,6 @@ LDADD+=		-lutil -lrc -leinfo
 
 include ../../Makefile.inc
 MK=		../../mk
-include ${MK}/debug.mk
 include ${MK}/prog.mk
 include ${MK}/git.mk
 include ${MK}/cc.mk