Merge branch 'master' of github.com:rg3/youtube-dl

[youtube-dl] / setup.py

diff --git a/setup.py b/setup.py
index eb7b1a2121632f66f6b7d9b5d829cd9eaf46ccb5..1d2e71e15fb24d6ae5a79d8cee2ebfcbfad6c3fb 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import print_function
+
+from glob import glob
 import pkg_resources
 import sys
 
@@ -23,7 +25,9 @@ py2exe_options = {
     "compressed": 1,
     "optimize": 2,
     "dist_dir": '.',
-    "dll_excludes": ['w9xpopen.exe']
+    "dll_excludes": ['w9xpopen.exe'],
+    "includes": [m.replace('\\', '.').replace('/', '.')[:-3]
+                 for m in glob('youtube_dl/*/*.py')]
 }
 py2exe_console = [{
     "script": "./youtube_dl/__main__.py",
@@ -57,7 +61,7 @@ setup(
     author = 'Ricardo Garcia',
     maintainer = 'Philipp Hagemeister',
     maintainer_email = 'phihag@phihag.de',
-    packages = ['youtube_dl'],
+    packages = ['youtube_dl', 'youtube_dl.extractor'],
 
     # Provokes warning on most systems (why?!)
     #test_suite = 'nose.collector',