X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=a79ff35674e0fc53c1f5ee0a21a53815d42d44ff;hb=3a9f5c6d6d9c6f9ab9b07afaa7601e2ceb13c301;hp=c69ad6c0f8464a93d93e47b2d5670434ef335ca5;hpb=bf5e376eeb3b8092c7f54d608be81caccb48fdab;p=vsys.git

diff --git a/Makefile b/Makefile
index c69ad6c..a79ff35 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-all: vsys factory-exec/*
+all: vsys factory/.done 
 
 include .dep
 
@@ -39,11 +39,10 @@ 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-exec/%: factory/%
-	make -C factory/
-	cp -fR factory/ factory-exec
+factory/.done: factory/*
+	$(MAKE) -C factory/
 
-install: vsys factory
+install: vsys factory/.done
 	cp vsys $(INSTALL_DIR)/usr/bin
 	cp vsys-initscript $(INSTALL_DIR)/etc/init.d/vsys 
 	cp -fR factory/ factory-exec/
@@ -53,4 +52,5 @@ 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