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>
This commit is contained in:
parent
98d3b407fe
commit
227f831639
2
mk/cc.mk
2
mk/cc.mk
@ -31,3 +31,5 @@ _CC_FLAGS_SH= for f in ${_CCFLAGS}; do \
|
|||||||
done;
|
done;
|
||||||
_CC_FLAGS:= $(shell ${_CC_FLAGS_SH})
|
_CC_FLAGS:= $(shell ${_CC_FLAGS_SH})
|
||||||
CFLAGS+= ${_CC_FLAGS}
|
CFLAGS+= ${_CC_FLAGS}
|
||||||
|
|
||||||
|
include ${MK}/debug.mk
|
||||||
|
@ -9,5 +9,4 @@ CPPFLAGS+= -I../includes
|
|||||||
MK= ../../mk
|
MK= ../../mk
|
||||||
include ${MK}/lib.mk
|
include ${MK}/lib.mk
|
||||||
include ${MK}/cc.mk
|
include ${MK}/cc.mk
|
||||||
include ${MK}/debug.mk
|
|
||||||
include ${MK}/termcap.mk
|
include ${MK}/termcap.mk
|
||||||
|
@ -12,7 +12,6 @@ CPPFLAGS+= -I../includes
|
|||||||
MK= ../../mk
|
MK= ../../mk
|
||||||
include ${MK}/lib.mk
|
include ${MK}/lib.mk
|
||||||
include ${MK}/cc.mk
|
include ${MK}/cc.mk
|
||||||
include ${MK}/debug.mk
|
|
||||||
|
|
||||||
# Massage our header file for our dirs
|
# Massage our header file for our dirs
|
||||||
SED_CMD= -e 's:@PREFIX@:${PREFIX}:g'
|
SED_CMD= -e 's:@PREFIX@:${PREFIX}:g'
|
||||||
|
@ -36,7 +36,6 @@ LDADD+= -lutil -lrc -leinfo
|
|||||||
|
|
||||||
include ../../Makefile.inc
|
include ../../Makefile.inc
|
||||||
MK= ../../mk
|
MK= ../../mk
|
||||||
include ${MK}/debug.mk
|
|
||||||
include ${MK}/prog.mk
|
include ${MK}/prog.mk
|
||||||
include ${MK}/git.mk
|
include ${MK}/git.mk
|
||||||
include ${MK}/cc.mk
|
include ${MK}/cc.mk
|
||||||
|
Loading…
Reference in New Issue
Block a user