X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/5982c377d781eee86238df7260b9be01a2a228a8..97b4d188a6cb9af6f2e53c85c9124c861ca691fc:/Makefile

diff --git a/Makefile b/Makefile
index c4512ec..1019e9a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,44 @@
-all: mlton
+# Supported flags
+#  BUILD32=1 Target 32-bit x86 (Doesn't Work)
+#  TC=1      Stop after typchecking when building using mlton
+#  DEBUG=1   Keep debugging information when building using mlton
+
+all: mlton bin/vmailpasswd elisp/domtool-tables.el
+
+bin/vmailpasswd: src/mail/vmailpasswd.c
+	$(CC) $(CFLAGS) -lcrypt -o $@ $<
+
+ifeq ($(BUILD32), 1)
+	CFLAGS += -m32
+endif
 
 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
+
+clean:
+	rm -f bin/*
+	rm -f openssl/openssl_sml.so
+	rm -f openssl/openssl_sml.o
+	rm -f pcre/pcre_sml.so
+	rm -f pcre/pcre_sml.o
 
 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/smtplog bin/setsa bin/mysql-fixperms bin/webbw bin/domtool-tail \
+	bin/fwtool bin/domtool-config bin/domtool-portal
 
-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
+	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 \
@@ -23,7 +47,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 \
@@ -31,13 +55,21 @@ configDefault/configDefault.sml: src/configDefault.sml.header \
 		>configDefault/configDefault.sml
 
 openssl/openssl_sml.o: openssl/openssl_sml.c
-	gcc -fPIC -c openssl/openssl_sml.c -o openssl/openssl_sml.o
+	gcc $(CFLAGS) -fPIC -c openssl/openssl_sml.c -o openssl/openssl_sml.o
 
 openssl/openssl_sml.so: openssl/openssl_sml.o
-	gcc -shared -Wl,-soname,openssl_sml.so \
+	gcc $(CFLAGS) -shared -Wl,-soname,openssl_sml.so \
 		-o openssl/openssl_sml.so \
 		openssl/openssl_sml.o -lssl
 
+pcre/pcre_sml.o: pcre/pcre_sml.c
+	gcc $(CFLAGS) -fPIC -c pcre/pcre_sml.c -o pcre/pcre_sml.o
+
+pcre/pcre_sml.so: pcre/pcre_sml.o
+	gcc $(CFLAGS) -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 +113,22 @@ 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
+
+src/fwtool.mlb: src/prefix.mlb src/sources src/suffix.mlb
+	$(MAKE_MLB_BASE) >src/fwtool.mlb
+	echo "main-fwtool.sml" >>src/fwtool.mlb
+
+src/domtool-config.mlb: src/prefix.mlb src/sources src/suffix.mlb
+	$(MAKE_MLB_BASE) >src/domtool-config.mlb
+	echo "main-config.sml" >>src/domtool-config.mlb
+
+src/domtool-portal.mlb: src/prefix.mlb src/sources src/suffix.mlb
+	$(MAKE_MLB_BASE) >src/domtool-portal.mlb
+	echo "main-portal.sml" >>src/domtool-portal.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 +139,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 +156,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 \
@@ -106,10 +165,18 @@ COMMON_MLTON_DEPS := openssl/mlton/FFI/libssl.h.mlb \
 
 MLTON := mlton -link-opt -ldl
 
-ifdef DEBUG
+ifeq ($(BUILD32),1)
+	MLTON += -codegen c -target i386 -cc-opt -m32
+endif
+
+ifeq ($(DEBUG), 1)
 	MLTON += -const 'Exn.keepHistory true'
 endif
 
+ifeq ($(TC), 1)
+	MLTON += -stop tc
+endif
+
 bin/domtool-server: $(COMMON_MLTON_DEPS) src/domtool-server.mlb 
 	$(MLTON) -output bin/domtool-server src/domtool-server.mlb
 
@@ -137,12 +204,39 @@ 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/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
+
+bin/domtool-config: $(COMMON_MLTON_DEPS) src/domtool-config.mlb src/main-config.sml
+	$(MLTON) -output bin/domtool-config src/domtool-config.mlb
+
+bin/domtool-portal: $(COMMON_MLTON_DEPS) src/domtool-portal.mlb src/main-portal.sml
+	$(MLTON) -output bin/domtool-portal src/domtool-portal.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/
+	cp scripts/domtool-vmailpasswd /usr/local/sbin/
 	cp scripts/domtool-adduser /usr/local/bin/
 	cp scripts/domtool-addcert /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/
@@ -150,25 +244,55 @@ 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
 	-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 bin/domtool-config /usr/local/bin/
+	cp bin/domtool-portal /usr/local/sbin/
 	cp src/plugins/domtool-postgres /usr/local/sbin/
 	cp src/plugins/domtool-mysql /usr/local/sbin/
+	-mkdir -p $(EMACS_DIR)
+	install -d -m 755 -o domtool -g nogroup /var/domtool
+	cp elisp/*.el $(EMACS_DIR)/
 
 .PHONY: grab_lib install_server install_slave
 
 grab_lib:
 	rsync -r --delete /afs/hcoop.net/common/etc/domtool/lib/* lib/
 
+install_systemd_dispatcher:
+	install -m 644 -o root -g root scripts/domtool-server.service /etc/systemd/system/domtool-slave.service
+	systemctl daemon-reload
+
+install_systemd_worker:
+	install -m 644 -o root -g root scripts/domtool-slave.service /etc/systemd/system/domtool-slave.service
+	systemctl daemon-reload
+
+install_serverslave:
+	service domtool-server stop
+	service domtool-slave stop
+	make install
+	service domtool-server start
+	service domtool-slave start
+
 install_server:
-	sudo /etc/init.d/domtool-server stop
-	sudo make install
-	sudo /etc/init.d/domtool-server start
+	service domtool-server stop
+	make install
+	service domtool-server start
+
+install_slave:
+	service domtool-slave stop
+	make install
+	service domtool-slave start