aboutsummaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2011-02-02 16:42:17 -0600
committerWilliam Hubbs <w.d.hubbs@gmail.com>2011-02-04 22:28:57 -0600
commita2e9cde737ede93502a80fe50e62b0aea50643dc (patch)
tree589e8a5376bfdbe49a3a280ca0b65d3062912d42 /mk
parentaaaea44d224016bccfd008d0b904961f788d8189 (diff)
remove BSD make code to handle including .depend
Diffstat (limited to 'mk')
-rw-r--r--mk/depend-.mk2
-rw-r--r--mk/depend-gmake.mk3
-rw-r--r--mk/depend.mk7
3 files changed, 1 insertions, 11 deletions
diff --git a/mk/depend-.mk b/mk/depend-.mk
deleted file mode 100644
index 9d13b527..00000000
--- a/mk/depend-.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# This space left intentionally blank because gmake does not load .depend
-# by default
diff --git a/mk/depend-gmake.mk b/mk/depend-gmake.mk
deleted file mode 100644
index 947843e1..00000000
--- a/mk/depend-gmake.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# Tell gmake to include the optional dependency file.
-# This sucks, but I don't know any other way of portably making this work.
--include .depend
diff --git a/mk/depend.mk b/mk/depend.mk
index 067c1ef0..44af3782 100644
--- a/mk/depend.mk
+++ b/mk/depend.mk
@@ -10,9 +10,4 @@ IGNOREFILES+= .depend
depend: .depend extra_depend
-# Nasty hack. depend-.mk is a blank file, depend-gmake.mk has a gmake specific
-# command to optionally include .depend.
-# Someone should patch gmake to optionally include .depend if it exists.
-_INC_DEP= $(shell if ${MAKE} --version | grep -q "^GNU "; then \
- echo "gmake"; else echo ""; fi)
-include ${MK}/depend-${_INC_DEP}.mk
+-include .depend