Permalink
Browse files

Merge pull request #2 from maurer/master

Makefile fixes
  • Loading branch information...
2 parents 09ffa24 + bb3b650 commit f2029642557350160b5ca0f478ad2049b46f021f @robsimmons robsimmons committed Apr 9, 2012
Showing with 11 additions and 7 deletions.
  1. +11 −7 makefile → Makefile
View
@@ -1,16 +1,20 @@
+default: ollibot server
-default: copy-mlton commandline-mlton server-mlton
+ollibot: bin/ollibot
-ollibot: copy-mlton commandline-mlton
-
-server: copy-mlton server-mlton
+server: bin/olliserver
+.PHONY: copy-mlton
copy-mlton:
rm -Rf escape-src
sml -m tools/escape-sml/sources.cm < /dev/null
+ mkdir -p bin
-server-mlton:
+bin/ollibot: copy-mlton
-mlton -default-ann 'allowFFI true' -default-ann 'sequenceNonUnit warn' -output bin/olliserver escape-src/server.mlb src/server/raw-network.c
-commandline-mlton:
- -mlton -default-ann 'sequenceNonUnit warn' -output bin/ollibot escape-src/commandline.mlb
+bin/olliserver: copy-mlton
+ -mlton -default-ann 'sequenceNonUnit warn' -output bin/ollibot escape-src/commandline.mlb
+
+clean:
+ rm -rf bin escape-src

0 comments on commit f202964

Please sign in to comment.