[Python-checkins] cpython (merge 3.2 -> 3.3): add proper dependencies on expat headers and sources

christian.heimes python-checkins at python.org
Sat Feb 9 17:04:34 CET 2013


http://hg.python.org/cpython/rev/f2c2846f0c2f
changeset:   82093:f2c2846f0c2f
branch:      3.3
parent:      82090:474296d6d4a1
parent:      82092:ce411fd690fd
user:        Christian Heimes <christian at cheimes.de>
date:        Sat Feb 09 17:02:16 2013 +0100
summary:
  add proper dependencies on expat headers and sources

files:
  setup.py |  18 +++++++++++++++++-
  1 files changed, 17 insertions(+), 1 deletions(-)


diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1394,6 +1394,7 @@
             define_macros = []
             expat_lib = ['expat']
             expat_sources = []
+            expat_depends = []
         else:
             expat_inc = [os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')]
             define_macros = [
@@ -1403,12 +1404,25 @@
             expat_sources = ['expat/xmlparse.c',
                              'expat/xmlrole.c',
                              'expat/xmltok.c']
+            expat_depends = ['expat/ascii.h',
+                             'expat/asciitab.h',
+                             'expat/expat.h',
+                             'expat/expat_config.h',
+                             'expat/expat_external.h',
+                             'expat/internal.h',
+                             'expat/latin1tab.h',
+                             'expat/utf8tab.h',
+                             'expat/xmlrole.h',
+                             'expat/xmltok.h',
+                             'expat/xmltok_impl.h'
+                             ]
 
         exts.append(Extension('pyexpat',
                               define_macros = define_macros,
                               include_dirs = expat_inc,
                               libraries = expat_lib,
-                              sources = ['pyexpat.c'] + expat_sources
+                              sources = ['pyexpat.c'] + expat_sources,
+                              depends = expat_depends,
                               ))
 
         # Fredrik Lundh's cElementTree module.  Note that this also
@@ -1421,6 +1435,8 @@
                                   include_dirs = expat_inc,
                                   libraries = expat_lib,
                                   sources = ['_elementtree.c'],
+                                  depends = ['pyexpat.c'] + expat_sources +
+                                      expat_depends,
                                   ))
         else:
             missing.append('_elementtree')

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list