From 4ae57899af37131dc215a7ed35d1aa7b5a157e5e Mon Sep 17 00:00:00 2001
From: Christophe Benz <christophe.benz@gmail.com>
Date: Tue, 6 Jul 2010 12:44:46 +0200
Subject: [PATCH] add missing subpackages, call makefiles automatically

---
 Makefile                              | 5 -----
 weboob/frontends/qboobmsg/Makefile    | 5 -----
 weboob/frontends/qboobmsg/setup.py    | 4 ++++
 weboob/frontends/qhavesex/Makefile    | 5 -----
 weboob/frontends/qhavesex/setup.py    | 4 ++++
 weboob/frontends/qvideoob/Makefile    | 5 -----
 weboob/frontends/qvideoob/setup.py    | 4 ++++
 weboob/frontends/videoob_web/setup.py | 2 ++
 8 files changed, 14 insertions(+), 20 deletions(-)
 delete mode 100644 Makefile
 delete mode 100644 weboob/frontends/qboobmsg/Makefile
 delete mode 100644 weboob/frontends/qhavesex/Makefile
 delete mode 100644 weboob/frontends/qvideoob/Makefile

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 66c50fc8..00000000
--- a/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-qt:
-	make -C weboob/tools/application/qt/
-	make -C weboob/frontends/qvideoob/
-	make -C weboob/frontends/qhavesex/
-	make -C weboob/frontends/qboobmsg/
diff --git a/weboob/frontends/qboobmsg/Makefile b/weboob/frontends/qboobmsg/Makefile
deleted file mode 100644
index 04c08812..00000000
--- a/weboob/frontends/qboobmsg/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all:
-	$(MAKE) -C ui
-
-clean:
-	$(MAKE) -C ui clean
diff --git a/weboob/frontends/qboobmsg/setup.py b/weboob/frontends/qboobmsg/setup.py
index 0cf39e75..fc0ac970 100755
--- a/weboob/frontends/qboobmsg/setup.py
+++ b/weboob/frontends/qboobmsg/setup.py
@@ -22,6 +22,8 @@ from setuptools import setup
 import os
 
 
+os.system('make -C %s/ui' % os.path.dirname(__file__))
+
 setup(
     name='weboob-qboobmsg',
     version='0.1',
@@ -35,11 +37,13 @@ setup(
         'weboob',
         'weboob.frontends',
         'weboob.frontends.qboobmsg',
+        'weboob.frontends.qboobmsg.ui',
         ],
     scripts=[
         'scripts/qboobmsg',
         ],
     install_requires=[
+        'weboob-core-qt',
         'weboob-messages-backends',
         ],
 )
diff --git a/weboob/frontends/qhavesex/Makefile b/weboob/frontends/qhavesex/Makefile
deleted file mode 100644
index 04c08812..00000000
--- a/weboob/frontends/qhavesex/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all:
-	$(MAKE) -C ui
-
-clean:
-	$(MAKE) -C ui clean
diff --git a/weboob/frontends/qhavesex/setup.py b/weboob/frontends/qhavesex/setup.py
index 421de501..3a65ffb9 100755
--- a/weboob/frontends/qhavesex/setup.py
+++ b/weboob/frontends/qhavesex/setup.py
@@ -22,6 +22,8 @@ from setuptools import setup
 import os
 
 
+os.system('make -C %s/ui' % os.path.dirname(__file__))
+
 setup(
     name='weboob-qhavesex',
     version='0.1',
@@ -36,11 +38,13 @@ setup(
         'weboob',
         'weboob.frontends',
         'weboob.frontends.qhavesex',
+        'weboob.frontends.qhavesex.ui',
         ],
     scripts=[
         'scripts/qhavesex',
         ],
     install_requires=[
+        'weboob-core-qt',
         'weboob-dating-backends',
         ],
 )
diff --git a/weboob/frontends/qvideoob/Makefile b/weboob/frontends/qvideoob/Makefile
deleted file mode 100644
index 04c08812..00000000
--- a/weboob/frontends/qvideoob/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all:
-	$(MAKE) -C ui
-
-clean:
-	$(MAKE) -C ui clean
diff --git a/weboob/frontends/qvideoob/setup.py b/weboob/frontends/qvideoob/setup.py
index 2106c7b8..c8b18828 100755
--- a/weboob/frontends/qvideoob/setup.py
+++ b/weboob/frontends/qvideoob/setup.py
@@ -22,6 +22,8 @@ from setuptools import setup
 import os
 
 
+os.system('make -C %s/ui' % os.path.dirname(__file__))
+
 setup(
     name='weboob-qvideoob',
     version='0.1',
@@ -36,11 +38,13 @@ setup(
         'weboob',
         'weboob.frontends',
         'weboob.frontends.qvideoob',
+        'weboob.frontends.qvideoob.ui',
         ],
     scripts=[
         'scripts/qvideoob',
         ],
     install_requires=[
+        'weboob-core-qt',
         'weboob-video-backends',
         ],
 )
diff --git a/weboob/frontends/videoob_web/setup.py b/weboob/frontends/videoob_web/setup.py
index 65dddad4..3368b261 100755
--- a/weboob/frontends/videoob_web/setup.py
+++ b/weboob/frontends/videoob_web/setup.py
@@ -36,6 +36,8 @@ setup(
         'weboob',
         'weboob.frontends',
         'weboob.frontends.videoob_web',
+        'weboob.frontends.videoob_web.public',
+        'weboob.frontends.videoob_web.templates',
         ],
     scripts=[
         'scripts/videoob-web-server',