diff options
| author | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-09-01 22:44:44 +0000 |
|---|---|---|
| committer | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-09-01 22:44:44 +0000 |
| commit | eb910456e2f01255f277fe060fef6f7dd3018cf7 (patch) | |
| tree | f34967b93597ee1e1ab597ea420393732d5b66a0 /.Makefile.inc | |
| parent | db6308f63001b3071c9104736e4a40cfb87468ec (diff) | |
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
Diffstat (limited to '.Makefile.inc')
| -rw-r--r-- | .Makefile.inc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/.Makefile.inc b/.Makefile.inc index 901ced4fb..b2eaa4abe 100644 --- 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 |