Rename User::GetPort to GetServerPort to clarify its purpose

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

diff --git a/make/gnu-real.mk b/make/gnu-real.mk
index e0a8af68f05e48e7d64e02b8ca0dd795d1758da7..79fc2cd9ecad3d3ecbb788f402120a00f2dbbd63 100644 (file)
--- a/make/gnu-real.mk
+++ b/make/gnu-real.mk
@@ -2,13 +2,14 @@ CORE_TARGS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
 MODE_TARGS = $(patsubst %.cpp,%.o,$(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 += modeclasses.a threadengines/threadengine_pthread.o
+CORE_TARGS += threadengines/threadengine_pthread.o
 CORE_TARGS += socketengines/$(SOCKETENGINE).o
-MOD_TARGS += modules/m_spanningtree.so
+CORE_TARGS += $(MODE_TARGS)
+MOD_TARGS += $(shell perl -e 'print join " ", grep s!([^/]+)/$$!$$1.so!, <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 = $(shell perl -e 'print join " ", grep s!([^/]+)\.cpp!.$$1.d!, <*.cpp>, <commands/*.cpp>, <modes/*.cpp>, <modules/*.cpp>, <modules/m_*/*.cpp>')
+DFILES += $(shell perl -e 'print join " ", grep s!([^/]+)/?$$!.$$1.d!, <modules/m_*/>')
 DFILES += socketengines/.$(SOCKETENGINE).d threadengines/.threadengine_pthread.d
 
 all: inspircd commands modules
@@ -17,19 +18,14 @@ commands: $(CMD_TARGS)
 
 modules: $(MOD_TARGS)
 
-modeclasses.a: $(MODE_TARGS)
-       @../make/run-cc.pl ar crs modeclasses.a $(MODE_TARGS)
-
-modules/m_spanningtree.so: $(SPANNINGTREE_TARGS)
-       $(RUNCC) $(FLAGS) -shared -export-dynamic -o $@ $(SPANNINGTREE_TARGS)
-
 inspircd: $(CORE_TARGS)
-       $(RUNCC) $(FLAGS) $(CORE_FLAGS) -o inspircd $(LDLIBS) $(CORE_TARGS)
+       $(RUNCC) -o $@ $(CORELDFLAGS) $(LDLIBS) $(CORE_TARGS)
 
 .%.d: %.cpp
-       @$(VDEP_IN)
        @../make/calcdep.pl $<
-       @$(VDEP_OUT)
+
+.%.d: %
+       @../make/calcdep.pl $<
 
 .PHONY: all alldep commands modules