Merge branch 'master' into senslab2

[sfa.git] / setup.py

diff --git a/setup.py b/setup.py
index eafced4..96cb8cb 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ from glob import glob
 import shutil
 from distutils.core import setup
 
-scripts = glob("sfa/clientbin/*.py") + \
+scripts = glob("clientbin/*.py") + \
     [ 
     'config/sfa-config-tty',
     'config/gen-sfa-cm-config.py',
@@ -22,11 +22,9 @@ scripts = glob("sfa/clientbin/*.py") + \
 
 packages = [
     'sfa', 
-    'sfa/openstack',
     'sfa/trust',
     'sfa/storage',
     'sfa/util', 
-    'sfa/client',
     'sfa/server',
     'sfa/methods',
     'sfa/generic',
@@ -34,14 +32,21 @@ packages = [
     'sfa/importer',
 
 
+
     'sfa/senslab',
 
-    'sfa/planetlab',
+
+
+
 
     'sfa/rspecs',
     'sfa/rspecs/elements',
     'sfa/rspecs/elements/versions',
     'sfa/rspecs/versions',
+    'sfa/client',
+    'sfa/planetlab',
+    'sfa/openstack',
+    'sfa/federica',
     'sfatables',
     'sfatables/commands',
     'sfatables/processors',