| 1 |
commit: 227f83163908a1e2bfb783a7500263f5c204cb36 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 28 16:00:34 2011 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 28 16:00:34 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=227f8316 |
| 7 |
|
| 8 |
cc.mk: move debug.mk out of end Makefiles |
| 9 |
|
| 10 |
Since we always want debug.mk whenever we include cc.mk, move the include |
| 11 |
out of the Makefiles and into cc.mk itself. This also fixes an include |
| 12 |
order bug in rc/Makefile where debug.mk is included before cc.mk and |
| 13 |
breaks the default CFLAGS setup in cc.mk. |
| 14 |
|
| 15 |
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org> |
| 16 |
|
| 17 |
--- |
| 18 |
mk/cc.mk | 2 ++ |
| 19 |
src/libeinfo/Makefile | 1 - |
| 20 |
src/librc/Makefile | 1 - |
| 21 |
src/rc/Makefile | 1 - |
| 22 |
4 files changed, 2 insertions(+), 3 deletions(-) |
| 23 |
|
| 24 |
diff --git a/mk/cc.mk b/mk/cc.mk |
| 25 |
index 4192b34..ceb82f1 100644 |
| 26 |
--- a/mk/cc.mk |
| 27 |
+++ b/mk/cc.mk |
| 28 |
@@ -31,3 +31,5 @@ _CC_FLAGS_SH= for f in ${_CCFLAGS}; do \ |
| 29 |
done; |
| 30 |
_CC_FLAGS:= $(shell ${_CC_FLAGS_SH}) |
| 31 |
CFLAGS+= ${_CC_FLAGS} |
| 32 |
+ |
| 33 |
+include ${MK}/debug.mk |
| 34 |
|
| 35 |
diff --git a/src/libeinfo/Makefile b/src/libeinfo/Makefile |
| 36 |
index b93b5e5..ec756b4 100644 |
| 37 |
--- a/src/libeinfo/Makefile |
| 38 |
+++ b/src/libeinfo/Makefile |
| 39 |
@@ -9,5 +9,4 @@ CPPFLAGS+= -I../includes |
| 40 |
MK= ../../mk |
| 41 |
include ${MK}/lib.mk |
| 42 |
include ${MK}/cc.mk |
| 43 |
-include ${MK}/debug.mk |
| 44 |
include ${MK}/termcap.mk |
| 45 |
|
| 46 |
diff --git a/src/librc/Makefile b/src/librc/Makefile |
| 47 |
index 574aa2a..963fb41 100644 |
| 48 |
--- a/src/librc/Makefile |
| 49 |
+++ b/src/librc/Makefile |
| 50 |
@@ -12,7 +12,6 @@ CPPFLAGS+= -I../includes |
| 51 |
MK= ../../mk |
| 52 |
include ${MK}/lib.mk |
| 53 |
include ${MK}/cc.mk |
| 54 |
-include ${MK}/debug.mk |
| 55 |
|
| 56 |
# Massage our header file for our dirs |
| 57 |
SED_CMD= -e 's:@PREFIX@:${PREFIX}:g' |
| 58 |
|
| 59 |
diff --git a/src/rc/Makefile b/src/rc/Makefile |
| 60 |
index 5397415..fc6b9aa 100644 |
| 61 |
--- a/src/rc/Makefile |
| 62 |
+++ b/src/rc/Makefile |
| 63 |
@@ -36,7 +36,6 @@ LDADD+= -lutil -lrc -leinfo |
| 64 |
|
| 65 |
include ../../Makefile.inc |
| 66 |
MK= ../../mk |
| 67 |
-include ${MK}/debug.mk |
| 68 |
include ${MK}/prog.mk |
| 69 |
include ${MK}/git.mk |
| 70 |
include ${MK}/cc.mk |
Archives