Fixing little bugs during first deleuze/mire test

[hcoop/domtool2.git] / Makefile

diff --git a/Makefile b/Makefile
index bbd19f3..dd84ab0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,9 +3,9 @@ all: mlton
 COMMON_DEPS := configDefault/config.sig configDefault/configDefault.sml \
        openssl/openssl_sml.so
 
-.PHONY: all mlton smlnj
+.PHONY: all mlton smlnj install
 
-mlton: bin/domtool-server
+mlton: bin/domtool-server bin/domtool-client
 
 smlnj: $(COMMON_DEPS) openssl/smlnj/FFI/libssl.h.cm src/domtool.cm
 
@@ -42,6 +42,12 @@ src/domtool-server.mlb: Makefile src/prefix.mlb src/sources src/suffix.mlb
                | sed 's/^\(.*\).lex$$/\1.lex.sml/' >src/domtool-server.mlb
        echo "main-server.sml" >>src/domtool-server.mlb
 
+src/domtool-client.mlb: Makefile src/prefix.mlb src/sources src/suffix.mlb
+       cat src/prefix.mlb src/sources src/suffix.mlb \
+               | sed 's/^\(.*\).grm$$/\1.grm.sig\n\1.grm.sml/' \
+               | sed 's/^\(.*\).lex$$/\1.lex.sml/' >src/domtool-client.mlb
+       echo "main-client.sml" >>src/domtool-client.mlb
+
 openssl/smlnj/FFI/libssl.h.cm: openssl/openssl_sml.h
        cd openssl/smlnj ; ml-nlffigen -d FFI -lh LibsslH.libh -include ../libssl-h.sml \
        -cm libssl.h.cm -D__builtin_va_list="void*" \
@@ -53,13 +59,25 @@ openssl/mlton/FFI/libssl.h.mlb: openssl/openssl_sml.h
        ../openssl_sml.h
 
 %.lex.sml: %.lex
-       ml-lex $<
+       mllex $<
 
 %.grm.sig %.grm.sml: %.grm
-       ml-yacc $<
+       mlyacc $<
 
 bin/domtool-server: openssl/mlton/FFI/libssl.h.mlb \
                src/domtool-server.mlb src/domtool.lex.sml \
                src/domtool.grm.sig src/domtool.grm.sml \
-               $(COMMON_DEPS)
+               $(COMMON_DEPS) src/*.sig src/*.sml
        mlton -output bin/domtool-server -link-opt -ldl src/domtool-server.mlb
+
+bin/domtool-client: openssl/mlton/FFI/libssl.h.mlb \
+               src/domtool-client.mlb src/domtool.lex.sml \
+               src/domtool.grm.sig src/domtool.grm.sml \
+               $(COMMON_DEPS) src/*.sig src/*.sml
+       mlton -output bin/domtool-client -link-opt -ldl src/domtool-client.mlb
+
+install:
+       cp scripts/domtool-publish /usr/local/sbin/
+       cp openssl/openssl_sml.so /usr/local/lib/
+       cp bin/domtool-server /usr/local/sbin/
+       cp bin/domtool-client /usr/local/bin/domtool