Move file inclusion logic into calcdep, and complain about ambiguous #include directi...

[user/henk/code/inspircd.git] / make / gnu-real.mk

diff --git a/make/gnu-real.mk b/make/gnu-real.mk
index f6d86eb00275f43446463718cd55c19ffb691dfe..e892295a6a044ae7823c59f3f91109f9ba3a9675 100644 (file)
--- a/make/gnu-real.mk
+++ b/make/gnu-real.mk
@@ -1,16 +1,11 @@
-CORE_TARGS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-MODE_TARGS = $(patsubst %.cpp,%.o,$(wildcard modes/*.cpp))
+CORE_TARGS = $(patsubst %.cpp,%.o,$(wildcard *.cpp) $(wildcard modes/*.cpp))
 CMD_TARGS = $(patsubst %.cpp,%.so,$(wildcard commands/*.cpp))
 MOD_TARGS = $(patsubst %.cpp,%.so,$(wildcard modules/*.cpp))
-SPANNINGTREE_TARGS = $(patsubst %.cpp,%.o,$(wildcard modules/m_spanningtree/*.cpp))
 
-CORE_TARGS += threadengines/threadengine_pthread.o
-CORE_TARGS += socketengines/$(SOCKETENGINE).o
-CORE_TARGS += $(MODE_TARGS)
-MOD_TARGS += modules/m_spanningtree.so
+CORE_TARGS += socketengines/$(SOCKETENGINE).o threadengines/threadengine_pthread.o
+MOD_TARGS += $(shell perl -e 'print join " ", grep s!/?$$!.so!, grep -d, <modules/m_*>')
 
-DFILES = $(shell perl -e 'print join " ", grep s!([^/]+)\.cpp!.$$1.d!, <*.cpp>, <commands/*.cpp>, <modes/*.cpp>, <modules/*.cpp>, <modules/m_spanningtree/*.cpp>')
-DFILES += socketengines/.$(SOCKETENGINE).d threadengines/.threadengine_pthread.d
+DFILES = $(shell ../make/calcdep.pl -all)
 
 all: inspircd commands modules
 
@@ -18,14 +13,14 @@ commands: $(CMD_TARGS)
 
 modules: $(MOD_TARGS)
 
-modules/m_spanningtree.so: $(SPANNINGTREE_TARGS)
-       $(RUNCC) $(FLAGS) $(PICLDFLAGS) -o $@ $(SPANNINGTREE_TARGS)
-
 inspircd: $(CORE_TARGS)
-       $(RUNCC) $(FLAGS) $(CORE_FLAGS) -o $@ $(LDLIBS) $(CORE_TARGS)
+       $(RUNCC) -o $@ $(CORELDFLAGS) $(LDLIBS) $(CORE_TARGS)
 
 .%.d: %.cpp
-       @../make/calcdep.pl $<
+       @../make/calcdep.pl -file $<
+
+.%.d: %
+       @../make/calcdep.pl -file $<
 
 .PHONY: all alldep commands modules