Additions while poking around people's configs

[hcoop/domtool2.git] / Makefile

diff --git a/Makefile b/Makefile
index 68feaf0..b92bf32 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,24 @@
-all: mlton
+all: mlton bin/vmailpasswd elisp/domtool-tables.el
+
+bin/vmailpasswd: src/mail/vmailpasswd.c
+       $(CC) -lcrypt -o $@ $<
 
 COMMON_DEPS := configDefault/config.sig configDefault/configDefault.sml \
-       openssl/openssl_sml.so config.sml
+       openssl/openssl_sml.so pcre/pcre_sml.so config.sml
+
+EMACS_DIR := /usr/local/share/emacs/site-lisp/domtool-mode
 
 config.sml:
        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/smtplog bin/setsa bin/mysql-fixperms bin/webbw
 
-smlnj: $(COMMON_DEPS) openssl/smlnj/FFI/libssl.h.cm src/domtool.cm
+smlnj: $(COMMON_DEPS) openssl/smlnj/FFI/libssl.h.cm pcre/smlnj/FFI/libpcre.h.cm \
+       src/domtool.cm
 
 configDefault/config.sig: src/config.sig.header \
                configDefault/*.csg configDefault/*.cfs \
@@ -38,6 +44,14 @@ openssl/openssl_sml.so: openssl/openssl_sml.o
                -o openssl/openssl_sml.so \
                openssl/openssl_sml.o -lssl
 
+pcre/pcre_sml.o: pcre/pcre_sml.c
+       gcc -fPIC -c pcre/pcre_sml.c -o pcre/pcre_sml.o
+
+pcre/pcre_sml.so: pcre/pcre_sml.o
+       gcc -shared -Wl,-soname,pcre_sml.so \
+               -o pcre/pcre_sml.so \
+               pcre/pcre_sml.o -lpcre
+
 src/domtool.cm: src/prefix.cm src/sources
        cat src/prefix.cm src/sources >src/domtool.cm
 
@@ -81,6 +95,10 @@ src/smtplog.mlb: src/prefix.mlb src/sources src/suffix.mlb
        $(MAKE_MLB_BASE) >src/smtplog.mlb
        echo "main-smtplog.sml" >>src/smtplog.mlb
 
+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
+
 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*" \
@@ -91,6 +109,16 @@ openssl/mlton/FFI/libssl.h.mlb: openssl/openssl_sml.h
        -mlbfile libssl.h.mlb -cppopt -D__builtin_va_list="void*" \
        ../openssl_sml.h
 
+pcre/smlnj/FFI/libpcre.h.cm: pcre/pcre_sml.h
+       cd pcre/smlnj ; ml-nlffigen -d FFI -lh LibpcreH.libh -include ../libpcre-h.sml \
+       -cm libpcre.h.cm -D__builtin_va_list="void*" \
+       ../pcre_sml.h
+
+pcre/mlton/FFI/libpcre.h.mlb: pcre/pcre_sml.h
+       cd pcre/mlton ; mlnlffigen -dir FFI -libhandle LibpcreH.libh -include ../libpcre-h.sml \
+       -mlbfile libpcre.h.mlb -cppopt -D__builtin_va_list="void*" \
+       ../pcre_sml.h
+
 %.lex.sml: %.lex
        mllex $<
 
@@ -98,6 +126,7 @@ openssl/mlton/FFI/libssl.h.mlb: openssl/openssl_sml.h
        mlyacc $<
 
 COMMON_MLTON_DEPS := openssl/mlton/FFI/libssl.h.mlb \
+       pcre/mlton/FFI/libpcre.h.mlb \
        src/domtool.lex.sml \
        src/domtool.grm.sig src/domtool.grm.sml \
        $(COMMON_DEPS) src/*.sig src/*.sml \
@@ -137,7 +166,20 @@ bin/setsa: $(COMMON_MLTON_DEPS) src/setsa.mlb
 bin/smtplog: $(COMMON_MLTON_DEPS) src/smtplog.mlb
        $(MLTON) -output bin/smtplog src/smtplog.mlb
 
-install:
+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
+       mlton -output bin/webbw src/stats/webbw.mlb
+
+elisp/domtool-tables.el: lib/*.dtl bin/domtool-doc
+       bin/domtool-doc -basis -emacs >$@
+
+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/
@@ -151,7 +193,6 @@ 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 bin/domtool-server /usr/local/sbin/
        -cp bin/domtool-slave /usr/local/sbin/
        -cp bin/domtool-client /usr/local/bin/domtool
@@ -161,8 +202,13 @@ install:
        -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 src/plugins/domtool-postgres /usr/local/sbin/
        cp src/plugins/domtool-mysql /usr/local/sbin/
+       -mkdir -p $(EMACS_DIR)
+       cp elisp/*.el $(EMACS_DIR)/
 
 .PHONY: grab_lib install_server install_slave