X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=b137434ce21442200165d0e3c4817b46f5b600c8;hb=refs%2Fheads%2Fopenvswitch;hp=c9e0d916a02da461e02319791768f47aedf19661;hpb=6c6b41cc95241c2074d1cb1dac2b85b888824ae5;p=nodemanager.git

diff --git a/Makefile b/Makefile
index c9e0d91..b137434 100644
--- a/Makefile
+++ b/Makefile
@@ -5,29 +5,49 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: Makefile,v 1.2 2006/11/13 20:04:44 mlhuang Exp $
-#
 
 # autoconf compatible variables
 datadir := /usr/share
 bindir := /usr/bin
 
-all: forward_api_calls
-	python setup.py build
+lib: forward_api_calls
+	python setup-lib.py build
+
+vs: 
+	python setup-vs.py build
+
+lxc: 
+	python setup-lxc.py build
 
 forward_api_calls: forward_api_calls.c
 	$(CC) -Wall -Os -o $@ $?
 	strip $@
 
-install:
-	python setup.py install \
+install-lib:
+	python setup-lib.py install \
+	    --install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
+	    --install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
+	    --install-scripts=$(DESTDIR)/$(bindir)
+	install -m 444 README $(DESTDIR)/$(datadir)/NodeManager
+
+install-vs:
+	python setup-vs.py install \
+	    --install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
+	    --install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
+	    --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.py 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
@@ -58,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