summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>2009-09-01 15:06:25 +0000
committerdanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>2009-09-01 15:06:25 +0000
commite9c90126360fbe6115eacb38ca807e10aeb9ff58 (patch)
tree0317f2a20ce2480bc905449ad7139fc8c5425d1f
parent9de77615d68f0cdc1402e828e828c67aa4699f60 (diff)
Move bsd-dep.mk/gnu-dep.mk to top-level Makefile
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11569 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--.Makefile.inc2
-rw-r--r--make/bsd-dep.mk5
-rw-r--r--make/gnu-dep.mk4
3 files changed, 1 insertions, 10 deletions
diff --git a/.Makefile.inc b/.Makefile.inc
index be9d7b3c6..6a793f3c3 100644
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -88,7 +88,7 @@ NICEFLAGS += -I$(COMPILE_ROOT)/include
all: finishmessage
alldep:
- @$(MAKEENV) $(MAKE) -C src -f ../make/$(MAKESTYLE)-dep.mk alldep
+ @cd src; ../make/calcdep.pl `perl -e 'print join " ", <*.cpp>, <commands/*.cpp>, <modes/*.cpp>, <modules/*.cpp>, <modules/m_*/*.cpp>'` socketengines/$(SOCKETENGINE).cpp threadengines/threadengine_pthread.cpp
allreal: $(HEADER) alldep
@$(MAKEENV) $(MAKE) -C src -f ../make/$(MAKESTYLE)-real.mk all
diff --git a/make/bsd-dep.mk b/make/bsd-dep.mk
deleted file mode 100644
index b283284d0..000000000
--- a/make/bsd-dep.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-DFILES != perl -e 'print join " ", <*.cpp>, <commands/*.cpp>, <modes/*.cpp>, <modules/*.cpp>, <modules/m_*/*.cpp>'
-DFILES += socketengines/$(SOCKETENGINE).cpp threadengines/threadengine_pthread.cpp
-
-alldep:
- ../make/calcdep.pl $(DFILES)
diff --git a/make/gnu-dep.mk b/make/gnu-dep.mk
deleted file mode 100644
index cd5b37078..000000000
--- a/make/gnu-dep.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-CFILES = $(shell perl -e 'print join " ", <*.cpp>, <commands/*.cpp>, <modes/*.cpp>, <modules/*.cpp>, <modules/m_*/*.cpp>')
-CFILES += socketengines/$(SOCKETENGINE).cpp threadengines/threadengine_pthread.cpp
-alldep:
- @../make/calcdep.pl $(CFILES)