X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;fp=Makefile;h=b137434ce21442200165d0e3c4817b46f5b600c8;hb=f699ab76a8c8a5ba09d2286a833a8a05ecf8564c;hp=e17e26343411cb76d8655e21136c80811f158e9e;hpb=c40748ce15f446462fe7050aaf825cc6e81c6d82;p=nodemanager.git

diff --git a/Makefile b/Makefile
index e17e263..b137434 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,9 @@ lib: forward_api_calls
 vs: 
 	python setup-vs.py build
 
+lxc: 
+	python setup-lxc.py build
+
 forward_api_calls: forward_api_calls.c
 	$(CC) -Wall -Os -o $@ $?
 	strip $@
@@ -34,9 +37,17 @@ install-vs:
 	    --install-scripts=$(DESTDIR)/$(bindir)
 	install -m 444 README $(DESTDIR)/$(datadir)/NodeManager
 
+install-lxc:
+	python setup-lxc.py install \
+	    --install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
+	    --install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
+	    --install-scripts=$(DESTDIR)/$(bindir)
+	install -m 444 README $(DESTDIR)/$(datadir)/NodeManager
+
 clean:
 	python setup-lib.py clean
 	python setup-vs.py clean
+	python setup-lxc.py clean
 	rm -f forward_api_calls *.pyc build
 
 .PHONY: all install clean
@@ -67,7 +78,8 @@ ifeq (,$(NODEURL))
 	@echo "  e.g. make sync NODE=vnode01.inria.fr"
 	@exit 1
 else
-	+$(RSYNC) ./ $(NODEURL)/usr/share/NodeManager/
+	+$(RSYNC) --exclude sshsh ./ $(NODEURL)/usr/share/NodeManager/
+	+$(RSYNC) ./sshsh $(NODEURL)/bin/
 	+$(RSYNC) ./initscripts/nm $(NODEURL)/etc/init.d/nm
 	ssh -i $(NODE).key.rsa root@$(NODE) service nm restart
 endif