tweak privatebridge to remove exception message when ovs is not installed - prints...

[nodemanager.git] / Makefile

diff --git a/Makefile b/Makefile
index 5648041..6069f41 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,27 +9,29 @@
 # autoconf compatible variables
 datadir := /usr/share
 bindir := /usr/bin
-# call with either WITH_SYSTEMD=true or WITH_INIT=true
 initdir=/etc/rc.d/init.d
 systemddir := /usr/lib/systemd/system
 
+# call with either WITH_SYSTEMD=true or WITH_INIT=true
+# otherwise we try to guess some reasonable default
+ifeq "$(WITH_INIT)$(WITH_SYSTEMD)" ""
+ifeq "$(wildcard $systemddir/*)" ""
+WITH_INIT=true
+else
+WITH_SYSTEMD=true
+endif
+endif
 ####################
-lib: forward_api_calls
-       python setup-lib.py build
-
-vs: 
-       python setup-vs.py build
-
-lxc: 
-       python setup-lxc.py build
+all: forward_api_calls
+       python setup.py build
 
 forward_api_calls: forward_api_calls.c
        $(CC) -Wall -Os -o $@ $?
        strip $@
 
 #################### install
-install-lib: install-miscell install-startup
-       python setup-lib.py install \
+install: install-miscell install-startup
+       python setup.py install \
                --install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
                --install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
                --install-scripts=$(DESTDIR)/$(bindir)
@@ -67,25 +69,9 @@ install-systemd:
        mkdir -p $(DESTDIR)/$(systemddir)
        rsync -av systemd/ $(DESTDIR)/$(systemddir)
 
-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
 clean:
-       python setup-lib.py clean
-       python setup-vs.py clean
-       python setup-lxc.py clean
+       python setup.py clean
        rm -f forward_api_calls *.pyc build
 
 .PHONY: all install clean
@@ -102,7 +88,8 @@ DEBTARBALL=../$(RPMNAME)_$(DEBVERSION).orig.tar.bz2
 DATE=$(shell date -u +"%a, %d %b %Y %T")
 force:
 
-debian: debian/changelog debian.source debian.package
+debian: DESTDIR=debian/tmp
+debian: forward_api_calls install debian/changelog debian.source debian.package
 
 debian/changelog: debian/changelog.in
        sed -e "s|@VERSION@|$(DEBVERSION)|" -e "s|@DATE@|$(DATE)|" debian/changelog.in > debian/changelog
@@ -151,6 +138,9 @@ endif
 # keep this in sync with setup-vs.spec
 LXC_EXCLUDES= --exclude sliver_vs.py --exclude coresched_vs.py
 
+# run with make SYNC_RESTART=false if you want to skip restarting nm
+SYNC_RESTART=true
+
 sync:synclxc
 
 synclxc: $(NODE).key.rsa
@@ -165,7 +155,7 @@ else
        +$(RSYNC) $(LXC_EXCLUDES) --delete-excluded ./ $(NODEURL)/usr/share/NodeManager/
 #      +$(RSYNC) ./initscripts/ $(NODEURL)/etc/init.d/
        +$(RSYNC) ./systemd/ $(NODEURL)/usr/lib/systemd/system/
-#      ssh -i $(NODE).key.rsa root@$(NODE) service nm restart
+       -$(SYNC_RESTART) && { ssh -i $(NODE).key.rsa root@$(NODE) service nm restart ; } ||:
 endif
 
 ### fetching the key