Allow extra semicolon at end of where clause

[hcoop/domtool2.git] / Makefile

diff --git a/Makefile b/Makefile
index a89036b..a509c0b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,8 @@ COMMON_DEPS := configDefault/config.sig configDefault/configDefault.sml \
 .PHONY: all mlton smlnj install
 
 mlton: bin/domtool-server bin/domtool-client bin/domtool-slave \
-       bin/domtool-admin bin/domtool-doc bin/dbtool bin/vmail
+       bin/domtool-admin bin/domtool-doc bin/dbtool bin/vmail \
+       bin/smtplog bin/setsa
 
 smlnj: $(COMMON_DEPS) openssl/smlnj/FFI/libssl.h.cm src/domtool.cm
 
@@ -73,6 +74,10 @@ src/setsa.mlb: src/prefix.mlb src/sources src/suffix.mlb
        $(MAKE_MLB_BASE) >src/setsa.mlb
        echo "main-setsa.sml" >>src/setsa.mlb
 
+src/smtplog.mlb: src/prefix.mlb src/sources src/suffix.mlb
+       $(MAKE_MLB_BASE) >src/smtplog.mlb
+       echo "main-smtplog.sml" >>src/smtplog.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*" \
@@ -120,6 +125,9 @@ bin/vmail: $(COMMON_MLTON_DEPS) src/vmail.mlb
 bin/setsa: $(COMMON_MLTON_DEPS) src/setsa.mlb
        mlton -output bin/setsa -link-opt -ldl src/setsa.mlb
 
+bin/smtplog: $(COMMON_MLTON_DEPS) src/smtplog.mlb
+       mlton -output bin/smtplog -link-opt -ldl src/smtplog.mlb
+
 install:
        cp scripts/domtool-publish /usr/local/sbin/
        cp scripts/domtool-reset-global /usr/local/sbin/
@@ -128,6 +136,11 @@ install:
        cp scripts/domtool-addcert /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/
+       cp scripts/domtool-server-logged /usr/local/bin/
+       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 bin/domtool-server /usr/local/sbin/
        -cp bin/domtool-slave /usr/local/sbin/
@@ -137,6 +150,7 @@ install:
        -cp bin/dbtool /usr/local/bin/
        -cp bin/vmail /usr/local/bin/
        -cp bin/setsa /usr/local/bin/
+       -cp bin/smtplog /usr/local/bin/
        cp src/plugins/domtool-postgres /usr/local/sbin/
        cp src/plugins/domtool-mysql /usr/local/sbin/