Fix Webalizer LogFile directive printing

[hcoop/domtool2.git] / Makefile

diff --git a/Makefile b/Makefile
index bd83eb1..036f5fa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -36,22 +36,20 @@ 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
-       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-slave.mlb
+       $(MAKE_MLB_BASE) >src/domtool-slave.mlb
        echo "main-slave.sml" >>src/domtool-slave.mlb
 
 openssl/smlnj/FFI/libssl.h.cm: openssl/openssl_sml.h
@@ -70,25 +68,19 @@ openssl/mlton/FFI/libssl.h.mlb: openssl/openssl_sml.h
 %.grm.sig %.grm.sml: %.grm
        mlyacc $<
 
-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 \
-               src/plugins/*.sig src/plugins/*.sml
+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: $(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 \
-               src/plugins/*.sig src/plugins/*.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: openssl/mlton/FFI/libssl.h.mlb \
-               src/domtool-slave.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-slave: $(COMMON_MLTON_DEPS) src/domtool-slave.mlb
        mlton -output bin/domtool-slave -link-opt -ldl src/domtool-slave.mlb
 
 install: