summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-05-28 12:00:34 -0400
committerMike Frysinger <vapier@gentoo.org>2011-05-28 12:00:34 -0400
commit227f83163908a1e2bfb783a7500263f5c204cb36 (patch)
treeedba046c08f8ea7c52d48df8144954aa582e5108 /src
parent98d3b407fefeba04a143c53d4f5faf48acd0f665 (diff)
downloadopenrc-227f83163908a1e2bfb783a7500263f5c204cb36.tar.gz
openrc-227f83163908a1e2bfb783a7500263f5c204cb36.tar.bz2
openrc-227f83163908a1e2bfb783a7500263f5c204cb36.tar.xz
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>
Diffstat (limited to 'src')
-rw-r--r--src/libeinfo/Makefile1
-rw-r--r--src/librc/Makefile1
-rw-r--r--src/rc/Makefile1
3 files changed, 0 insertions, 3 deletions
diff --git a/src/libeinfo/Makefile b/src/libeinfo/Makefile
index b93b5e5..ec756b4 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 574aa2a..963fb41 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 5397415..fc6b9aa 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