X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=setup.py;h=1d2e71e15fb24d6ae5a79d8cee2ebfcbfad6c3fb;hb=a3522dfddd333ce14f9603ab43c58e9ae204adbb;hp=6d019dcbb6e24a982611a2e26be1b62997bc2bf3;hpb=d050de77f94a5dc9071c0b459ba62cb09c6696c4;p=youtube-dl

diff --git a/setup.py b/setup.py
index 6d019dcbb..1d2e71e15 100644
--- a/setup.py
+++ b/setup.py
@@ -2,10 +2,16 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import print_function
-from distutils.core import setup
+
+from glob import glob
 import pkg_resources
 import sys
 
+try:
+    from setuptools import setup
+except ImportError:
+    from distutils.core import setup
+
 try:
     import py2exe
     """This will create an exe that needs Microsoft Visual C++ 2008 Redistributable Package"""
@@ -19,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",
@@ -53,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',