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.mk17
1 files changed, 6 insertions, 11 deletions
diff --git a/make/gnu-real.mk b/make/gnu-real.mk
index 79fc2cd9e..e892295a6 100644
--- a/make/gnu-real.mk
+++ b/make/gnu-real.mk
@@ -1,16 +1,11 @@
-CORE_TARGS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-MODE_TARGS = $(patsubst %.cpp,%.o,$(wildcard modes/*.cpp))
+CORE_TARGS = $(patsubst %.cpp,%.o,$(wildcard *.cpp) $(wildcard modes/*.cpp))
CMD_TARGS = $(patsubst %.cpp,%.so,$(wildcard commands/*.cpp))
MOD_TARGS = $(patsubst %.cpp,%.so,$(wildcard modules/*.cpp))
-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_*/>')
+CORE_TARGS += socketengines/$(SOCKETENGINE).o threadengines/threadengine_pthread.o
+MOD_TARGS += $(shell perl -e 'print join " ", grep s!/?$$!.so!, grep -d, <modules/m_*>')
-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
+DFILES = $(shell ../make/calcdep.pl -all)
all: inspircd commands modules
@@ -22,10 +17,10 @@ inspircd: $(CORE_TARGS)
$(RUNCC) -o $@ $(CORELDFLAGS) $(LDLIBS) $(CORE_TARGS)
.%.d: %.cpp
- @../make/calcdep.pl $<
+ @../make/calcdep.pl -file $<
.%.d: %
- @../make/calcdep.pl $<
+ @../make/calcdep.pl -file $<
.PHONY: all alldep commands modules