From c6c6b6e831536ff6c5837728dc72656f727c1f41 Mon Sep 17 00:00:00 2001
From: Hackerpilot <briancschott@gmail.com>
Date: Sun, 3 Aug 2014 23:08:32 +0000
Subject: [PATCH] Move from build script to makefile

---
 build.sh | 82 +++--------------------------------------------
 makefile | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 101 insertions(+), 77 deletions(-)
 create mode 100644 makefile

diff --git a/build.sh b/build.sh
index 6a2d300..0220415 100755
--- a/build.sh
+++ b/build.sh
@@ -1,77 +1,5 @@
-rm -f containers/src/std/allocator.d
-
-dmd\
-	client.d\
-	messages.d\
-	stupidlog.d\
-	msgpack-d/src/msgpack.d\
-	-Imsgpack-d/src\
-	-release -inline -O -wi\
-	-ofdcd-client
-
-dmd\
-	actypes.d\
-	conversion/astconverter.d\
-	conversion/first.d\
-	conversion/second.d\
-	conversion/third.d\
-	autocomplete.d\
-	constants.d\
-	messages.d\
-	modulecache.d\
-	semantic.d\
-	server.d\
-	stupidlog.d\
-	string_interning.d\
-	libdparse/src/std/d/ast.d\
-	libdparse/src/std/d/entities.d\
-	libdparse/src/std/d/lexer.d\
-	libdparse/src/std/d/parser.d\
-	libdparse/src/std/lexer.d\
-	libdparse/src/std/allocator.d\
-	libdparse/src/std/d/formatter.d\
-	containers/src/memory/allocators.d\
-	containers/src/memory/appender.d\
-	containers/src/containers/dynamicarray.d\
-	containers/src/containers/ttree.d\
-	containers/src/containers/unrolledlist.d\
-	containers/src/containers/hashset.d\
-	containers/src/containers/internal/hash.d\
-	containers/src/containers/internal/node.d\
-	containers/src/containers/slist.d\
-	msgpack-d/src/msgpack.d\
-	-Icontainers/src\
-	-Imsgpack-d/src\
-	-Ilibdparse/src\
-	-wi -O -release -inline\
-	-ofdcd-server
-
-#gdc client.d\
-#	messages.d\
-#	msgpack-d/src/msgpack.d\
-#	-Imsgpack-d/src\
-#	-O3 -frelease -fno-bounds-check\
-#	-odcd-client
-#
-#gdc \
-#	actypes.d\
-#	astconverter.d\
-#	autocomplete.d\
-#	constants.d\
-#	messages.d\
-#	modulecache.d\
-#	semantic.d\
-#	server.d\
-#	stupidlog.d\
-#	dscanner/stdx/d/ast.d\
-#	dscanner/stdx/d/parser.d\
-#	dscanner/stdx/lexer.d\
-#	dscanner/stdx/d/lexer.d\
-#	dscanner/stdx/d/entities.d\
-#	dscanner/formatter.d\
-#	msgpack-d/src/msgpack.d\
-#	-Imsgpack-d/src\
-#	-Ilibdparse/src\
-#	-O3 -frelease -fno-bounds-check\
-#	-odcd-server
-
+echo "------------------------------------------------------"
+echo "There is a makefile now. This script just calls 'make'"
+echo "------------------------------------------------------"
+echo
+make -j2
diff --git a/makefile b/makefile
new file mode 100644
index 0000000..f9389e1
--- /dev/null
+++ b/makefile
@@ -0,0 +1,96 @@
+.PHONY: all
+
+all: dmd
+dmd: dmdserver dmdclient
+gdc: gdcserver gdcclient
+#ldc: ldcserver ldcclient
+
+DMD = dmd
+GDC = gdc
+#LDC = ldc
+
+CLIENT_SRC = client.d\
+	messages.d\
+	stupidlog.d\
+	msgpack-d/src/msgpack.d
+
+DMD_CLIENT_FLAGS = -Imsgpack-d/src\
+	-Imsgpack-d/src\
+	-release\
+	-inline\
+	-O\
+	-wi\
+	-ofdcd-client
+
+GDC_CLIENT_FLAGS =  -Imsgpack-d/src\
+	-O3\
+	-frelease\
+	-odcd-client
+
+SERVER_SRC = actypes.d\
+	conversion/astconverter.d\
+	conversion/first.d\
+	conversion/second.d\
+	conversion/third.d\
+	autocomplete.d\
+	constants.d\
+	messages.d\
+	modulecache.d\
+	semantic.d\
+	server.d\
+	stupidlog.d\
+	string_interning.d\
+	libdparse/src/std/d/ast.d\
+	libdparse/src/std/d/entities.d\
+	libdparse/src/std/d/lexer.d\
+	libdparse/src/std/d/parser.d\
+	libdparse/src/std/lexer.d\
+	libdparse/src/std/allocator.d\
+	libdparse/src/std/d/formatter.d\
+	containers/src/memory/allocators.d\
+	containers/src/memory/appender.d\
+	containers/src/containers/dynamicarray.d\
+	containers/src/containers/ttree.d\
+	containers/src/containers/unrolledlist.d\
+	containers/src/containers/hashset.d\
+	containers/src/containers/internal/hash.d\
+	containers/src/containers/internal/node.d\
+	containers/src/containers/slist.d\
+	msgpack-d/src/msgpack.d
+
+DMD_SERVER_FLAGS = -Icontainers/src\
+	-Imsgpack-d/src\
+	-Ilibdparse/src\
+	-wi\
+	-O\
+	-release\
+	-inline\
+	-ofdcd-server
+
+GDC_SERVER_FLAGS =  -Imsgpack-d/src\
+	-Ilibdparse/src\
+	-O3\
+	-frelease\
+	-odcd-server
+
+dmdclient:
+	rm -f containers/src/std/allocator.d
+	${DMD} ${CLIENT_SRC} ${DMD_CLIENT_FLAGS}
+
+dmdserver:
+	rm -f containers/src/std/allocator.d
+	${DMD} ${SERVER_SRC} ${DMD_SERVER_FLAGS}
+
+gdcclient:
+	rm -f containers/src/std/allocator.d
+	${GDC} {CLIENT_SRC} ${GDC_CLIENT_FLAGS}
+
+gdcserver:
+	rm -f containers/src/std/allocator.d
+	${GDC} {SERVER_SRC} ${GDC_SERVER_FLAGS}
+
+#ldcclient:
+#	${LDC} {CLIENT_SRC} ${LDC_CLIENT_FLAGS}
+#
+#ldcserver:
+#	${LDC} {SERVER_SRC} ${LDC_SERVER_FLAGS}