X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fgnu-real.mk;h=79fc2cd9ecad3d3ecbb788f402120a00f2dbbd63;hb=6278262baaed06e2acf134c53ed0485136d61f50;hp=263467038694784f15c6c4f63cdb79e4699aebf6;hpb=990e04bab51bf1c3771938b8f598272c1b31cdca;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/gnu-real.mk b/make/gnu-real.mk
index 263467038..79fc2cd9e 100644
--- a/make/gnu-real.mk
+++ b/make/gnu-real.mk
@@ -3,14 +3,14 @@ MODE_TARGS = $(patsubst %.cpp,%.o,$(wildcard modes/*.cpp))
 CMD_TARGS = $(patsubst %.cpp,%.so,$(wildcard commands/*.cpp))
 MOD_TARGS = $(patsubst %.cpp,%.so,$(wildcard modules/*.cpp))
 
-CORE_TARGS += modeclasses.a threadengines/threadengine_pthread.o
+CORE_TARGS += threadengines/threadengine_pthread.o
 CORE_TARGS += socketengines/$(SOCKETENGINE).o
+CORE_TARGS += $(MODE_TARGS)
+MOD_TARGS += $(shell perl -e 'print join " ", grep s!([^/]+)/$$!$$1.so!, <modules/m_*/>')
 
-DFILES = $(patsubst %.cpp,%.d,$(wildcard *.cpp))
-DFILES += $(patsubst %.cpp,%.d,$(wildcard commands/*.cpp))
-DFILES += $(patsubst %.cpp,%.d,$(wildcard modes/*.cpp))
-DFILES += $(patsubst %.cpp,%.d,$(wildcard modules/*.cpp))
-DFILES += socketengines/$(SOCKETENGINE).d threadengines/threadengine_pthread.d
+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
 
@@ -18,15 +18,15 @@ commands: $(CMD_TARGS)
 
 modules: $(MOD_TARGS)
 
-modeclasses.a: $(MODE_TARGS)
-	@../make/run-cc.pl ar crs modeclasses.a $(MODE_TARGS)
-
 inspircd: $(CORE_TARGS)
-	$(RUNCC) $(FLAGS) -rdynamic -L. -o inspircd $(LDLIBS) $(CORE_TARGS)
+	$(RUNCC) -o $@ $(CORELDFLAGS) $(LDLIBS) $(CORE_TARGS)
+
+.%.d: %.cpp
+	@../make/calcdep.pl $<
 
-%.d: %.cpp
+.%.d: %
 	@../make/calcdep.pl $<
 
-.PHONY: all commands modules
+.PHONY: all alldep commands modules
 
 -include $(DFILES)