X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/27e20924851ac773220fbf5fb810e296a1e0ee6a..87fedaf1820b1e4f8dcb12dbac29bfc641b18b18:/Makefile

diff --git a/Makefile b/Makefile
index a4ab474..4dd594b 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ COMMON_DEPS := configDefault/config.sig configDefault/configDefault.sml \
 
 .PHONY: all mlton smlnj install
 
-mlton: bin/domtool-server bin/domtool-client
+mlton: bin/domtool-server bin/domtool-client bin/domtool-slave bin/domtool-admin
 
 smlnj: $(COMMON_DEPS) openssl/smlnj/FFI/libssl.h.cm src/domtool.cm
 
@@ -36,18 +36,26 @@ openssl/openssl_sml.so: openssl/openssl_sml.o
 src/domtool.cm: Makefile src/prefix.cm src/sources
 	cat src/prefix.cm src/sources >src/domtool.cm
 
+MAKE_MLB_BASE := 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-server.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-server.mlb
+	$(MAKE_MLB_BASE) >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
+	$(MAKE_MLB_BASE) >src/domtool-client.mlb
 	echo "main-client.sml" >>src/domtool-client.mlb
 
+src/domtool-slave.mlb: Makefile src/prefix.mlb src/sources src/suffix.mlb
+	$(MAKE_MLB_BASE) >src/domtool-slave.mlb
+	echo "main-slave.sml" >>src/domtool-slave.mlb
+
+src/domtool-admin.mlb: Makefile src/prefix.mlb src/sources src/suffix.mlb
+	$(MAKE_MLB_BASE) >src/domtool-admin.mlb
+	echo "main-admin.sml" >>src/domtool-admin.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*" \
@@ -59,25 +67,40 @@ 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 $<
+
+COMMON_MLTON_DEPS := openssl/mlton/FFI/libssl.h.mlb \
+	src/domtool.lex.sml \
+	src/domtool.grm.sig src/domtool.grm.sml \
+	$(COMMON_DEPS) src/*.sig src/*.sml \
+	src/plugins/*.sig src/plugins/*.sml
 
-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) src/*.sig src/*.sml
+bin/domtool-server: $(COMMON_MLTON_DEPS) src/domtool-server.mlb 
 	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
+bin/domtool-client: $(COMMON_MLTON_DEPS) src/domtool-client.mlb
 	mlton -output bin/domtool-client -link-opt -ldl src/domtool-client.mlb
 
+bin/domtool-slave: $(COMMON_MLTON_DEPS) src/domtool-slave.mlb
+	mlton -output bin/domtool-slave -link-opt -ldl src/domtool-slave.mlb
+
+bin/domtool-admin: $(COMMON_MLTON_DEPS) src/domtool-admin.mlb
+	mlton -output bin/domtool-admin -link-opt -ldl src/domtool-admin.mlb
+
 install:
 	cp scripts/domtool-publish /usr/local/sbin/
+	cp scripts/domtool-reset-global /usr/local/sbin/
+	cp scripts/domtool-reset-local /usr/local/sbin/
 	cp openssl/openssl_sml.so /usr/local/lib/
 	cp bin/domtool-server /usr/local/sbin/
+	cp bin/domtool-slave /usr/local/sbin/
 	cp bin/domtool-client /usr/local/bin/domtool
+	cp bin/domtool-admin /usr/local/bin/
+
+.PHONY: grab_lib
+
+grab_lib:
+	rsync --delete /afs/hcoop.net/common/etc/domtool/lib/* lib/