From 8db36081940e85a02c71d0b51c6d2107ceffd3b4 Mon Sep 17 00:00:00 2001 From: danieldg Date: Tue, 1 Sep 2009 15:05:43 +0000 Subject: [PATCH] Clean up unneeded messages, fix BSD make git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11563 e03df62e-2008-0410-955e-edbf42e46eb7 --- .Makefile.inc | 6 ++---- make/bsd-real.mk | 4 ++-- make/gnu-real.mk | 2 -- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.Makefile.inc b/.Makefile.inc index feb8ed99b..03fdc5f03 100644 --- 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 4ae834329..8ae9bfe99 100644 --- 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>, , , , ' -DFILES += socketengines/$(SOCKETENGINE).d threadengines/threadengine_pthread.d +DFILES != perl -e 'print join " ", grep s!([^/]+)\.cpp!.$$1.d!, <*.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 e0a8af68f..489e1bbdf 100644 --- 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 -- 2.39.5