summaryrefslogtreecommitdiff
path: root/make/gnu-real.mk
diff options
context:
space:
mode:
Diffstat (limited to 'make/gnu-real.mk')
-rw-r--r--make/gnu-real.mk12
1 files changed, 6 insertions, 6 deletions
diff --git a/make/gnu-real.mk b/make/gnu-real.mk
index f6d86eb00..28c5afa60 100644
--- a/make/gnu-real.mk
+++ b/make/gnu-real.mk
@@ -2,14 +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 += threadengines/threadengine_pthread.o
CORE_TARGS += socketengines/$(SOCKETENGINE).o
CORE_TARGS += $(MODE_TARGS)
-MOD_TARGS += modules/m_spanningtree.so
+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
@@ -18,15 +18,15 @@ commands: $(CMD_TARGS)
modules: $(MOD_TARGS)
-modules/m_spanningtree.so: $(SPANNINGTREE_TARGS)
- $(RUNCC) $(FLAGS) $(PICLDFLAGS) -o $@ $(SPANNINGTREE_TARGS)
-
inspircd: $(CORE_TARGS)
$(RUNCC) $(FLAGS) $(CORE_FLAGS) -o $@ $(LDLIBS) $(CORE_TARGS)
.%.d: %.cpp
@../make/calcdep.pl $<
+.%.d: %
+ @../make/calcdep.pl $<
+
.PHONY: all alldep commands modules
-include $(DFILES)