Unbreak python bindings on 64-bit Linux.

svn path=/trunk/yasm/; revision=2252

diff --git a/tools/python-yasm/Makefile.inc b/tools/python-yasm/Makefile.inc
index b4275586cf5f0d8254a8afd4808d5a31122b08ce..ed816cfa2001d27410564e77d8a370da5c31a55e 100644 (file)
--- a/tools/python-yasm/Makefile.inc
+++ b/tools/python-yasm/Makefile.inc
@@ -50,13 +50,13 @@ CLEANFILES += yasm_python.c
 # Now the Python build magic...
 python-setup.txt: Makefile
        echo "includes=${DEFS} ${DEFAULT_INCLUDES} ${INCLUDES} ${AM_CPPFLAGS} ${CPPFLAGS}" > python-setup.txt
-       echo "sources=${libyasm_a_SOURCES}" >> python-setup.txt
+       echo "sources=${libyasm_a_SOURCES} ${nodist_libyasm_a_SOURCES}" >> python-setup.txt
        echo "srcdir=${srcdir}" >> python-setup.txt
        echo "gcc=${GCC}" >> python-setup.txt
 
 CLEANFILES += python-setup.txt
 
-.python-build: python-setup.txt yasm_python.c ${libyasm_a_SOURCES}
+.python-build: python-setup.txt yasm_python.c ${libyasm_a_SOURCES} ${nodist_libyasm_a_SOURCES}
        $(PYTHON) `test -f tools/python-yasm/setup.py || echo '$(srcdir)/'`tools/python-yasm/setup.py build
        touch .python-build
 python-build: .python-build

diff --git a/tools/python-yasm/setup.py b/tools/python-yasm/setup.py
index 60e2364da672fc5590e798a400e256fdb7e52aef..0633fd3e7305f4d0f08a4c7c1a3449dd74641e32 100644 (file)
--- a/tools/python-yasm/setup.py
+++ b/tools/python-yasm/setup.py
@@ -52,8 +52,6 @@ def ParseSources(src, srcdir):
     for tok in src.split():
         if tok.endswith(".c"):
             fn = tok
-        elif tok.endswith(".y"):
-            fn = basename(tok)[:-2] + ".c"
         else:
             continue
         if not exists(fn):
@@ -74,8 +72,6 @@ def RunSetup(incldir, cppflags, sources):
                                  sources=sources,
                                  extra_compile_args=cppflags,
                                  include_dirs=incldir,
-                                 library_dirs=['.'],
-                                 libraries=['yasm'],
                        ),
                       ],
           cmdclass = dict(build_ext=build_ext),