diff options
| author | Peter Johnson <peter@tortall.net> | 2009-12-30 06:21:24 +0000 |
|---|---|---|
| committer | Peter Johnson <peter@tortall.net> | 2009-12-30 06:21:24 +0000 |
| commit | 65b18427f41294fef3193c4a5ed794d3a17c1e2a (patch) | |
| tree | 4a8d29adb014834b96105e40b7425a7a733e0df4 /tools | |
| parent | 3888758ce322ce23a3922a3564575cda4cb1783c (diff) | |
| download | yasm-65b18427f41294fef3193c4a5ed794d3a17c1e2a.tar.gz | |
Unbreak python bindings on 64-bit Linux.
svn path=/trunk/yasm/; revision=2252
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/python-yasm/Makefile.inc | 4 | ||||
| -rw-r--r-- | tools/python-yasm/setup.py | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/tools/python-yasm/Makefile.inc b/tools/python-yasm/Makefile.inc index b4275586..ed816cfa 100644 --- 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 60e2364d..0633fd3e 100644 --- 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), |