Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/openrc:master commit in: mk/
Date: Sat, 05 Feb 2011 04:59:13
Message-Id: a2e9cde737ede93502a80fe50e62b0aea50643dc.williamH@gentoo
1 commit: a2e9cde737ede93502a80fe50e62b0aea50643dc
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 2 22:42:17 2011 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 5 04:28:57 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=a2e9cde7
7
8 remove BSD make code to handle including .depend
9
10 ---
11 mk/depend-.mk | 2 --
12 mk/depend-gmake.mk | 3 ---
13 mk/depend.mk | 7 +------
14 3 files changed, 1 insertions(+), 11 deletions(-)
15
16 diff --git a/mk/depend-.mk b/mk/depend-.mk
17 deleted file mode 100644
18 index 9d13b52..0000000
19 --- a/mk/depend-.mk
20 +++ /dev/null
21 @@ -1,2 +0,0 @@
22 -# This space left intentionally blank because gmake does not load .depend
23 -# by default
24
25 diff --git a/mk/depend-gmake.mk b/mk/depend-gmake.mk
26 deleted file mode 100644
27 index 947843e..0000000
28 --- a/mk/depend-gmake.mk
29 +++ /dev/null
30 @@ -1,3 +0,0 @@
31 -# Tell gmake to include the optional dependency file.
32 -# This sucks, but I don't know any other way of portably making this work.
33 --include .depend
34
35 diff --git a/mk/depend.mk b/mk/depend.mk
36 index 067c1ef..44af378 100644
37 --- a/mk/depend.mk
38 +++ b/mk/depend.mk
39 @@ -10,9 +10,4 @@ IGNOREFILES+= .depend
40
41 depend: .depend extra_depend
42
43 -# Nasty hack. depend-.mk is a blank file, depend-gmake.mk has a gmake specific
44 -# command to optionally include .depend.
45 -# Someone should patch gmake to optionally include .depend if it exists.
46 -_INC_DEP= $(shell if ${MAKE} --version | grep -q "^GNU "; then \
47 - echo "gmake"; else echo ""; fi)
48 -include ${MK}/depend-${_INC_DEP}.mk
49 +-include .depend