X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=4699dd68f2d2959471a7301a63c950a0c87fcf6c;hb=d50abed53bc4998db78f2acc0d168ec39bfa3375;hp=31d19639e30757fb16ca4f7eaeaea1500ecf2902;hpb=9c0a89044fa661c8ec6429888e538bcc7fad5ef4;p=vsys.git

diff --git a/Makefile b/Makefile
index 31d1963..4699dd6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-all: vsys vsyssh ocaml_inotify-0.4
+all: vsys 
 
 include .dep
 
@@ -27,8 +27,11 @@ docs: *.ml
 	ocamldoc -d . -html -o docs *.ml
 	mv *.html docs
 
-vsys: inotify.cmxa inotify.cmi globals.cmx fdwatcher.cmx dirwatcher.cmx fifowatcher.cmx frontend.cmx backend.cmx main.cmx docs
-	ocamlopt str.cmxa unix.cmxa inotify.cmxa globals.cmx fdwatcher.cmx dirwatcher.cmx fifowatcher.cmx frontend.cmx backend.cmx str.cmxa main.cmx -o vsys
+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
 
 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
@@ -42,4 +45,5 @@ dep:
 	ocamldep *.ml > .dep
 
 clean:
-	rm -fR *.cmi *.cmx sys usys 
+	$(MAKE) -C ocaml_inotify-0.4 clean
+	rm -fR *.cmi *.cmx sys usys *.o vsys vsys.b