Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Unified Diff: third_party/yasm/patched-yasm/tools/python-yasm/Makefile.inc

Issue 6170009: Update our yasm copy to yasm 1.1.0 (Part 1: yasm side)... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/yasm/patched-yasm/tools/python-yasm/Makefile.inc
===================================================================
--- third_party/yasm/patched-yasm/tools/python-yasm/Makefile.inc (revision 71129)
+++ third_party/yasm/patched-yasm/tools/python-yasm/Makefile.inc (working copy)
@@ -1,4 +1,4 @@
-# $Id: Makefile.inc 1948 2007-09-13 02:53:30Z peter $
+# $Id: Makefile.inc 2256 2010-01-01 20:55:07Z peter $
PYBINDING_DEPS = tools/python-yasm/bytecode.pxi
PYBINDING_DEPS += tools/python-yasm/errwarn.pxi
@@ -40,9 +40,9 @@
CLEANFILES += yasm.pyx
-# Actually run Pyrex
+# Actually run Cython
yasm_python.c: yasm.pyx _yasm.pxi $(PYBINDING_DEPS)
- $(PYTHON) -c "from Pyrex.Compiler.Main import main; main(command_line=1)" \
+ $(PYTHON) -c "from Cython.Compiler.Main import main; main(command_line=1)" \
-o $@ yasm.pyx
CLEANFILES += yasm_python.c
@@ -50,13 +50,13 @@
# 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
« no previous file with comments | « third_party/yasm/patched-yasm/tools/genperf/genperf.c ('k') | third_party/yasm/patched-yasm/tools/python-yasm/bytecode.pxi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698