X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=ad1fc195ac07a0f9bcb49f280e48ed0957f6f9d2;hb=65f0b4dd113321ced69ea976a64f6f06fb4e3660;hp=a79ff35674e0fc53c1f5ee0a21a53815d42d44ff;hpb=07b0ad16566c5a4ae8629e3a0cdee1d60c93594b;p=vsys.git

diff --git a/Makefile b/Makefile
index a79ff35..ad1fc19 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-all: vsys factory/.done 
+all: vsys 
 
 include .dep
 
@@ -33,24 +33,19 @@ ocaml_inotify-0.4/inotify.cmxa:
 splice_stub.o: splice_stub.c
 	gcc -c -I /usr/lib/ocaml -I /usr/lib64/ocaml splice_stub.c -o splice_stub.o
 
-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
+vsys: ocaml_inotify-0.4/inotify.cmxa globals.cmx fdwatcher.cmx conffile.cmx splice_stub.o splice.cmx dirwatcher.cmx fifowatcher.cmx frontend.cmx unixsocketwatcher.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 unixsocketwatcher.cmx  frontend.cmx backend.cmx conffile.cmx main.cmx -o 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/.done: factory/*
-	$(MAKE) -C factory/
-
-install: vsys factory/.done
+install: vsys
 	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