Cut out unneeded stuff

diff --git a/Makefile b/Makefile
index 69c9cbb..87d8923 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,18 +10,16 @@
 datadir := /usr/share
 bindir := /usr/bin
 
-lib: forward_api_calls
-       python setup-lib.py build
+install: install-lib install-lxc install-planetstack install-scripts
 
-vs: 
-       python setup-vs.py build
+lib:
+       python setup-lib.py build
 
 lxc: 
        python setup-lxc.py build
 
-forward_api_calls: forward_api_calls.c
-       $(CC) -Wall -Os -o $@ $?
-       strip $@
+planetstack: 
+       python setup-planetstack.py build
 
 install-lib:
        python setup-lib.py install \
@@ -30,13 +28,6 @@ install-lib:
                --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 \
@@ -69,6 +60,7 @@ clean:
        python setup-lib.py clean
        python setup-vs.py clean
        python setup-lxc.py clean
+       python setup-planetstack.py clean
        rm -f forward_api_calls *.pyc build
 
 .PHONY: all install clean

diff --git a/setup-lib.py b/setup-lib.py
index bb3ec6c..f80c0fd 100644 (file)
--- a/setup-lib.py
+++ b/setup-lib.py
@@ -43,7 +43,6 @@ setup(
         'plugins.vsys_privs',
         ],
     scripts = [
-        'forward_api_calls',
         ],
     packages = [
         ],