X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=8231fa877de338dfa7e883e672a44f1593732c92;hb=1126d7e497e6c3f68186ce484bab7346e468f5d7;hp=41fcab585d2f1100d7280838d7add26c0c0cfbcf;hpb=9b370b50943e11385a79628b038644536c0f3fbc;p=vsys.git

diff --git a/Makefile b/Makefile
index 41fcab5..8231fa8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,13 @@
-all: vsys factory
+#
+# $Id: Makefile 16196 2009-12-15 20:36:21Z thierry $
+# $URL: https://svn.planet-lab.org/svn/vsys/branches/0.9/Makefile $
+#
+
+# OCAML_OLD is set to non-empty if str.cmxa needs to be passed twice to the loader
+OCAML_RELEASE := $(shell ocaml -version)
+OCAML_OLD := $(strip $(findstring version 3.09,$(OCAML_RELEASE)) $(findstring version 3.10,$(OCAML_RELEASE)))
+
+all: vsys docs
 
 include .dep
 
@@ -33,19 +42,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 
+ifneq "$(OCAML_OLD)" ""
+	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 str.cmxa conffile.cmx main.cmx -o vsys
+else
+	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
+endif
 
 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:
-	make -C factory/
-
-install: vsys factory
+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