X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=d68413c350a6afb04ffb03d1822b6f42c6dbd5af;hb=44e09edfafd0348824f88d46ff926ac859aad299;hp=d05d91f4917171659c4352928c097cc0a8543167;hpb=4bb506215c662d430a339b7a3d24db10d43de61b;p=vsys.git

diff --git a/Makefile b/Makefile
index d05d91f..d68413c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-all: vsys 
+all: vsys factory-exec/*
 
 include .dep
 
@@ -30,20 +30,28 @@ docs: *.ml
 ocaml_inotify-0.4/inotify.cmxa:
 	$(MAKE) -C ocaml_inotify-0.4 && cp -f ocaml_inotify-0.4/inotify_stubs.o ./
 
-vsys: ocaml_inotify-0.4/inotify.cmxa globals.cmx fdwatcher.cmx dirwatcher.cmx fifowatcher.cmx frontend.cmx backend.cmx main.cmx docs
-	ocamlopt -I ocaml_inotify-0.4 str.cmxa unix.cmxa inotify.cmxa globals.cmx fdwatcher.cmx dirwatcher.cmx fifowatcher.cmx frontend.cmx backend.cmx str.cmxa main.cmx -o vsys
+splice_stub.o: splice_stub.c
+	gcc -c -I /usr/lib/ocaml -I /usr/lib64/ocaml splice_stub.c -o splice_stub.o
 
-vsys.b: inotify.cma inotify.cmi globals.ml fdwatcher.ml dirwatcher.ml fifowatcher.ml frontend.ml backend.ml main.ml
-	ocamlc -g str.cma unix.cma inotify.cma globals.cmo fdwatcher.cmo dirwatcher.cmo fifowatcher.cmo frontend.cmo backend.cmo str.cma main.cmo -o vsys.b
+vsys: ocaml_inotify-0.4/inotify.cmxa globals.cmx fdwatcher.cmx conffile.cmx splice_stub.o splice.cmx dirwatcher.cmx fifowatcher.cmx frontend.cmx backend.cmx main.cmx docs 
+	ocamlopt -I ocaml_inotify-0.4 str.cmxa unix.cmxa inotify.cmxa globals.cmx fdwatcher.cmx dirwatcher.cmx splice.cmx splice_stub.o directfifowatcher.cmx frontend.cmx backend.cmx str.cmxa conffile.cmx main.cmx -o vsys
 
-install: vsys
-	cp vsys /usr/bin
-	cp vsys.b /usr/bin
-	cp vsys-initscript /etc/init.d/vsys 
+vsys.b: ocaml_inotify-0.4/inotify.cma inotify.cmi globals.ml fdwatcher.ml dirwatcher.ml directfifowatcher.ml frontend.ml backend.ml main.ml
+	ocamlc -g str.cma unix.cma ocaml_inotify-0.4/inotify.cma globals.cmo fdwatcher.cmo dirwatcher.cmo directfifowatcher.cmo frontend.cmo backend.cmo str.cma conffile.cmo main.cmo -o vsys.b
+
+factory-exec/%: factory/%
+	$(MAKE) -C factory/
+	cp -fR factory/ factory-exec
+
+install: vsys factory
+	cp vsys $(INSTALL_DIR)/usr/bin
+	cp vsys-initscript $(INSTALL_DIR)/etc/init.d/vsys 
+	cp -fR factory/ factory-exec/
 
 dep:
 	ocamldep *.ml > .dep
 
 clean:
 	$(MAKE) -C ocaml_inotify-0.4 clean
+	$(MAKE) -C factory clean
 	rm -f *.cmi *.cmx sys usys *.o vsys vsys.b *.html *.css