Clean up unneeded messages, fix BSD make

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11563 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/.Makefile.inc b/.Makefile.inc
index feb8ed99b2761b67b3a5520df374dd5d516c53fd..03fdc5f036d970100c3cd61f8b638b87c9800c48 100644 (file)
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -58,12 +58,10 @@ SOCKETENGINE = @SOCKETENGINE@
 
 all: finishmessage
 
-alldep: $(HEADER)
-       @echo -n "Generating module dependencies..."
+alldep:
        @$(MAKEENV) $(MAKE) -C src -f ../make/$(MAKESTYLE)-dep.mk alldep
-       @echo 'done'
 
-allreal: alldep
+allreal: $(HEADER) alldep
        @$(MAKEENV) $(MAKE) -C src -f ../make/$(MAKESTYLE)-real.mk all
 
 module:

diff --git a/make/bsd-real.mk b/make/bsd-real.mk
index 4ae8343296c4a8c8c466d5506fdbd4d960fd6715..8ae9bfe9981144f40ad37cfaa3ee929adb3d51cf 100644 (file)
--- a/make/bsd-real.mk
+++ b/make/bsd-real.mk
@@ -8,8 +8,8 @@ CORE_TARGS += modeclasses.a threadengines/threadengine_pthread.o
 CORE_TARGS += socketengines/$(SOCKETENGINE).o
 MOD_TARGS += modules/m_spanningtree.so
 
-DFILES != perl -e 'print join " ", grep s/\.cpp/.d/, <*.cpp>, <commands/*.cpp>, <modes/*.cpp>, <modules/*.cpp>, <modules/m_spanningtree/*.cpp>'
-DFILES += socketengines/$(SOCKETENGINE).d threadengines/threadengine_pthread.d
+DFILES != 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
 
 all: inspircd commands modules
 

diff --git a/make/gnu-real.mk b/make/gnu-real.mk
index e0a8af68f05e48e7d64e02b8ca0dd795d1758da7..489e1bbdf3c15982b64edfde1e8c77bfa6457c04 100644 (file)
--- a/make/gnu-real.mk
+++ b/make/gnu-real.mk
@@ -27,9 +27,7 @@ inspircd: $(CORE_TARGS)
        $(RUNCC) $(FLAGS) $(CORE_FLAGS) -o inspircd $(LDLIBS) $(CORE_TARGS)
 
 .%.d: %.cpp
-       @$(VDEP_IN)
        @../make/calcdep.pl $<
-       @$(VDEP_OUT)
 
 .PHONY: all alldep commands modules