Factor path prefixes into ConfigCore structure

[hcoop/domtool2.git] / Makefile

diff --git a/Makefile b/Makefile
index 2d0c6ab..118c5de 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,12 +15,14 @@ config.sml:
 
 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/domtool-tail
+       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
+       CFLAGS += -m32
 
-configDefault/config.sig: src/config.sig.header \
+configDefault/config.sig: config/core/core.sig src/config.sig.header \
                configDefault/*.csg configDefault/*.cfs \
                src/config.sig.footer
        cat configDefault/*.csg \
@@ -29,7 +31,7 @@ configDefault/config.sig: src/config.sig.header \
                src/config.sig.footer \
                >configDefault/config.sig
 
-configDefault/configDefault.sml: src/configDefault.sml.header \
+configDefault/configDefault.sml: config/core/core.sml src/configDefault.sml.header \
                configDefault/*.cfg src/configDefault.sml.footer
        cat src/configDefault.sml.header \
                configDefault/*.cfg \
@@ -99,6 +101,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,6 +175,9 @@ 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/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
 
@@ -202,6 +211,7 @@ install: install_sos
        -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/