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

[user/henk/code/inspircd.git] / .Makefile.inc

diff --git a/.Makefile.inc b/.Makefile.inc
index 901ced4fb214b9300d5772572d5165a4d325cf65..b2eaa4abe5ae3420f2a9ac2c914f81ea5ae9116d 100644 (file)
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -14,7 +14,7 @@
 CC = @CC@
 SYSTEM = @SYSTEM@
 SOCKETENGINE = @SOCKETENGINE@
-CXXFLAGS = -pipe -fPIC -DPIC
+CXXFLAGS += -pipe -fPIC -DPIC
 LDLIBS = -pthread -lstdc++
 LDFLAGS = 
 SHARED = -shared -rdynamic
@@ -91,10 +91,7 @@ TARGET = all
 
 all: $(FOOTER)
 
-dep:
-       @cd src; ../make/calcdep.pl `perl -e 'print join " ", <*.cpp>, <commands/*.cpp>, <modes/*.cpp>, <modules/*.cpp>, <modules/m_*/*.cpp>'` socketengines/$(SOCKETENGINE).cpp threadengines/threadengine_pthread.cpp
-
-target: $(HEADER) dep
+target: $(HEADER)
        $(MAKEENV) $(MAKE) -C src -f ../make/$(MAKESTYLE)-real.mk $(TARGET)
 
 debug:
@@ -221,4 +218,4 @@ help:
        @echo ' deinstall Removes the files created by "make install"'
        @echo
 
-.PHONY: all dep target debug debug-header mod-header mod-footer std-header finishmessage install clean deinstall squeakyclean launchd_dir configureclean help
+.PHONY: all target debug debug-header mod-header mod-footer std-header finishmessage install clean deinstall squeakyclean launchd_dir configureclean help