From eb910456e2f01255f277fe060fef6f7dd3018cf7 Mon Sep 17 00:00:00 2001
From: danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Tue, 1 Sep 2009 22:44:44 +0000
Subject: Move file inclusion logic into calcdep, and complain about ambiguous
 #include directives there

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11587 e03df62e-2008-0410-955e-edbf42e46eb7
---
 make/bsd-real.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'make/bsd-real.mk')

diff --git a/make/bsd-real.mk b/make/bsd-real.mk
index 6fdf2e57f..4ccc11be3 100644
--- a/make/bsd-real.mk
+++ b/make/bsd-real.mk
@@ -1,13 +1,11 @@
 CORE_TARGS != perl -e 'print join " ", grep s/\.cpp/.o/, <*.cpp>, <modes/*.cpp>'
 CMD_TARGS != perl -e 'print join " ", grep s/\.cpp/.so/, <commands/*.cpp>'
 MOD_TARGS != perl -e 'print join " ", grep s/\.cpp/.so/, <modules/*.cpp>'
-MDIR_TARGS != perl -e 'print join " ", grep s!/?$$!.so!, <modules/m_*/>'
+MDIR_TARGS != perl -e 'print join " ", grep s!/?$$!.so!, grep -d, <modules/m_*>'
 
 CORE_TARGS += socketengines/$(SOCKETENGINE).o threadengines/threadengine_pthread.o
 
-DFILES != perl -e 'print join " ", grep s!([^/]+)\.cpp!.$$1.d!, <*.cpp>, <commands/*.cpp>, <modes/*.cpp>, <modules/*.cpp>, <modules/m_*/*.cpp>'
-DFILES2 != perl -e 'print join " ", grep s!([^/]+)/?$$!.$$1.d!, <modules/m_*/>'
-DFILES += $(DFILES2) socketengines/.$(SOCKETENGINE).d threadengines/.threadengine_pthread.d
+DFILES != perl ../make/calcdep.pl -all
 
 all: inspircd commands modules
 
-- 
cgit v1.2.3