Move IP<->sockaddr conversions into irc::sockets:: namespace

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

diff --git a/make/bsd-real.mk b/make/bsd-real.mk
index 4ae8343296c4a8c8c466d5506fdbd4d960fd6715..6fdf2e57f304445a90e071457fac6c0a7a7d4544 100644 (file)
--- a/make/bsd-real.mk
+++ b/make/bsd-real.mk
@@ -1,30 +1,22 @@
-CORE_TARGS != perl -e 'print join " ", grep s/\.cpp/.o/, <*.cpp>'
-MODE_TARGS != perl -e 'print join " ", grep s/\.cpp/.o/, <modes/*.cpp>'
+CORE_TARGS != perl -e 'print join " ", grep s/\.cpp/.o/, <*.cpp>, <modes/*.cpp>'
 CMD_TARGS != perl -e 'print join " ", grep s/\.cpp/.so/, <commands/*.cpp>'
 MOD_TARGS != perl -e 'print join " ", grep s/\.cpp/.so/, <modules/*.cpp>'
-SPANNINGTREE_TARGS != perl -e 'print join " ", grep s/\.cpp/.o/, <modules/m_spanningtree/*.cpp>'
+MDIR_TARGS != perl -e 'print join " ", grep s!/?$$!.so!, <modules/m_*/>'
 
-CORE_TARGS += modeclasses.a threadengines/threadengine_pthread.o
-CORE_TARGS += socketengines/$(SOCKETENGINE).o
-MOD_TARGS += modules/m_spanningtree.so
+CORE_TARGS += socketengines/$(SOCKETENGINE).o threadengines/threadengine_pthread.o
 
-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_*/*.cpp>'
+DFILES2 != perl -e 'print join " ", grep s!([^/]+)/?$$!.$$1.d!, <modules/m_*/>'
+DFILES += $(DFILES2) socketengines/.$(SOCKETENGINE).d threadengines/.threadengine_pthread.d
 
 all: inspircd commands modules
 
 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)
+modules: $(MOD_TARGS) $(MDIR_TARGS)
 
 inspircd: $(CORE_TARGS)
-       $(RUNCC) $(FLAGS) $(CORE_FLAGS) -o inspircd $(LDLIBS) $(CORE_TARGS)
+       $(RUNCC) -o $@ $(CORELDFLAGS) $(LDLIBS) $(CORE_TARGS)
 
 .for FILE in $(DFILES)
 .include "$(FILE)"