X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/931aae1463c95af3bb24a5cec367fe657a478856..0ef723ce97749ca6a6764afd39ba05ca81fb1bc2:/Makefile

diff --git a/Makefile b/Makefile
index c837af1..7f5d7d5 100644
--- a/Makefile
+++ b/Makefile
@@ -9,13 +9,14 @@ COMMON_DEPS := configDefault/config.sig configDefault/configDefault.sml \
 EMACS_DIR := /usr/local/share/emacs/site-lisp/domtool-mode
 
 config.sml:
-	echo -e 'structure Config :> CONFIG = struct\nopen ConfigDefault\nend' > $@
+	/bin/echo -e 'structure Config :> CONFIG = struct\nopen ConfigDefault\nend' > $@
 
-.PHONY: all mlton smlnj install
+.PHONY: all mlton smlnj install install_sos
 
 mlton: bin/domtool-server bin/domtool-client bin/domtool-slave \
 	bin/domtool-admin bin/domtool-doc bin/dbtool bin/vmail \
-	bin/smtplog bin/setsa bin/mysql-fixperms bin/webbw
+	bin/smtplog bin/setsa bin/mysql-fixperms bin/webbw bin/domtool-tail \
+	bin/fwtool
 
 smlnj: $(COMMON_DEPS) openssl/smlnj/FFI/libssl.h.cm pcre/smlnj/FFI/libpcre.h.cm \
 	src/domtool.cm
@@ -99,6 +100,10 @@ src/mysql-fixperms.mlb: src/prefix.mlb src/sources src/suffix.mlb
 	$(MAKE_MLB_BASE) >src/mysql-fixperms.mlb
 	echo "main-mysql-fixperms.sml" >>src/mysql-fixperms.mlb
 
+src/fwtool.mlb: src/prefix.mlb src/sources src/suffix.mlb
+	$(MAKE_MLB_BASE) >src/fwtool.mlb
+	echo "main-fwtool.sml" >>src/fwtool.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*" \
@@ -169,19 +174,29 @@ bin/smtplog: $(COMMON_MLTON_DEPS) src/smtplog.mlb
 bin/mysql-fixperms: $(COMMON_MLTON_DEPS) src/mysql-fixperms.mlb
 	$(MLTON) -output bin/mysql-fixperms src/mysql-fixperms.mlb
 
-bin/webbw: $(COMMON_MLTON_DEPS) src/stats/webbw.mlb
+bin/fwtool: $(COMMON_MLTON_DEPS) src/fwtool.mlb
+	$(MLTON) -output bin/fwtool src/fwtool.mlb
+
+bin/webbw: $(COMMON_MLTON_DEPS) src/stats/webbw.mlb src/stats/*.sml
 	mlton -output bin/webbw src/stats/webbw.mlb
 
+bin/domtool-tail: $(COMMON_MLTON_DEPS) src/tail/tail.mlb src/tail/*.sml
+	mlton -output bin/domtool-tail src/tail/tail.mlb
+
 elisp/domtool-tables.el: lib/*.dtl bin/domtool-doc
 	bin/domtool-doc -basis -emacs >$@
 
-install:
+install_sos:
+	cp openssl/openssl_sml.so /usr/local/lib/
+	cp pcre/pcre_sml.so /usr/local/lib/
+
+install: install_sos
 	cp scripts/domtool-publish /usr/local/sbin/
 	cp scripts/domtool-reset-global /usr/local/sbin/
 	cp scripts/domtool-reset-local /usr/local/sbin/
 	cp scripts/domtool-adduser /usr/local/bin/
 	cp scripts/domtool-addcert /usr/local/bin/
-	cp scripts/domtool-addcert-daemon /usr/local/bin/
+	cp scripts/domtool-readdcerts /usr/local/bin/
 	cp scripts/domtool-addacl /usr/local/bin/
 	cp scripts/domtool-rmuser /usr/local/bin/
 	cp scripts/domtool-admin-sudo /usr/local/bin/
@@ -189,20 +204,21 @@ install:
 	cp scripts/domtool-slave-logged /usr/local/bin/
 	cp scripts/domtool-server /etc/init.d/
 	cp scripts/domtool-slave /etc/init.d/
-	cp openssl/openssl_sml.so /usr/local/lib/
-	cp pcre/pcre_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/
 	-cp bin/domtool-doc /usr/local/bin/
 	-cp bin/dbtool /usr/local/bin/
+	-cp bin/fwtool /usr/local/bin/
 	-cp bin/vmail /usr/local/bin/
 	-cp bin/setsa /usr/local/bin/
 	-cp bin/smtplog /usr/local/bin/
 	-cp bin/mysql-fixperms /usr/local/bin/
 	-cp bin/vmailpasswd /usr/local/bin/
 	-cp bin/webbw /usr/local/sbin/
+	-cp bin/domtool-tail /usr/local/bin/
+	-chmod +s /usr/local/bin/domtool-tail
 	cp src/plugins/domtool-postgres /usr/local/sbin/
 	cp src/plugins/domtool-mysql /usr/local/sbin/
 	-mkdir -p $(EMACS_DIR)