X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=setup.py;h=9c40154abd5e0da9f76bc70f8ce74cce4f20a236;hb=131842bb0b96551c3c9e0cf479f8537d32e5ad0c;hp=c59ab086f0f28937c9e57502a4a8d642edfd3d95;hpb=e646ffe795460592bbb39af455fc9f159bd7e5ae;p=youtube-dl

diff --git a/setup.py b/setup.py
index c59ab086f..9c40154ab 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,6 @@
 
 from __future__ import print_function
 
-from glob import glob
 import pkg_resources
 import sys
 
@@ -13,8 +12,9 @@ except ImportError:
     from distutils.core import setup
 
 try:
+    # This will create an exe that needs Microsoft Visual C++ 2008
+    # Redistributable Package
     import py2exe
-    """This will create an exe that needs Microsoft Visual C++ 2008 Redistributable Package"""
 except ImportError:
     if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
         print("Cannot import py2exe", file=sys.stderr)
@@ -26,8 +26,6 @@ py2exe_options = {
     "optimize": 2,
     "dist_dir": '.',
     "dll_excludes": ['w9xpopen.exe'],
-    "includes": [m.replace('\\', '.').replace('/', '.')[:-3]
-                 for m in glob('youtube_dl/*/*.py')]
 }
 py2exe_console = [{
     "script": "./youtube_dl/__main__.py",
@@ -61,7 +59,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',