Merging recent changes from the 4.2 branch into trunk.

[vsys.git] / Makefile

diff --git a/Makefile b/Makefile
index a79ff35..b5272ca 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-all: vsys factory/.done 
+all: vsys 
 
 include .dep
 
@@ -39,18 +39,13 @@ vsys: ocaml_inotify-0.4/inotify.cmxa globals.cmx fdwatcher.cmx conffile.cmx spli
 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