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

Unified Diff: third_party/yasm/patched-yasm/Makefile.am

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
« no previous file with comments | « third_party/yasm/patched-yasm/COPYING ('k') | third_party/yasm/patched-yasm/Makefile.in » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/yasm/patched-yasm/Makefile.am
===================================================================
--- third_party/yasm/patched-yasm/Makefile.am (revision 71129)
+++ third_party/yasm/patched-yasm/Makefile.am (working copy)
@@ -1,12 +1,14 @@
-# $Id: Makefile.am 2184 2009-03-24 05:04:15Z peter $
+# $Id: Makefile.am 2299 2010-03-04 05:08:00Z peter $
SUBDIRS = po .
+ACLOCAL_AMFLAGS = -I m4
AM_YFLAGS = -d
AM_CFLAGS = @MORE_CFLAGS@
bin_PROGRAMS =
dist_man_MANS =
+notrans_dist_man_MANS =
TESTS =
TESTS_ENVIRONMENT =
noinst_PROGRAMS = genstring
@@ -32,9 +34,6 @@
# libyasm-stdint.h doesn't clean up after itself?
CONFIG_CLEAN_FILES = libyasm-stdint.h
-# automake doesn't distribute mkinstalldirs?
-EXTRA_DIST += config/mkinstalldirs
-
EXTRA_DIST += tools/Makefile.inc
EXTRA_DIST += libyasm/Makefile.inc
EXTRA_DIST += modules/Makefile.inc
@@ -62,19 +61,22 @@
EXTRA_DIST += Mkfiles/Makefile.dj
EXTRA_DIST += Mkfiles/dj/config.h
EXTRA_DIST += Mkfiles/dj/libyasm-stdint.h
+EXTRA_DIST += Mkfiles/vc9/config.h
EXTRA_DIST += Mkfiles/vc9/crt_secure_no_deprecate.vsprops
+EXTRA_DIST += Mkfiles/vc9/libyasm-stdint.h
+EXTRA_DIST += Mkfiles/vc9/readme.vc9.txt
+EXTRA_DIST += Mkfiles/vc9/vc98_swap.py
+EXTRA_DIST += Mkfiles/vc9/vsyasm.vcproj
EXTRA_DIST += Mkfiles/vc9/yasm.sln
EXTRA_DIST += Mkfiles/vc9/yasm.vcproj
EXTRA_DIST += Mkfiles/vc9/ytasm.vcproj
-EXTRA_DIST += Mkfiles/vc9/config.h
-EXTRA_DIST += Mkfiles/vc9/libyasm-stdint.h
-EXTRA_DIST += Mkfiles/vc9/readme.vc9.txt
EXTRA_DIST += Mkfiles/vc9/yasm.rules
-EXTRA_DIST += Mkfiles/vc9/vc98_swap.py
EXTRA_DIST += Mkfiles/vc9/genmacro/genmacro.vcproj
EXTRA_DIST += Mkfiles/vc9/genmacro/run.bat
EXTRA_DIST += Mkfiles/vc9/genmodule/genmodule.vcproj
EXTRA_DIST += Mkfiles/vc9/genmodule/run.bat
+EXTRA_DIST += Mkfiles/vc9/genperf/genperf.vcproj
+EXTRA_DIST += Mkfiles/vc9/genperf/run.bat
EXTRA_DIST += Mkfiles/vc9/genstring/genstring.vcproj
EXTRA_DIST += Mkfiles/vc9/genstring/run.bat
EXTRA_DIST += Mkfiles/vc9/genversion/genversion.vcproj
@@ -83,26 +85,59 @@
EXTRA_DIST += Mkfiles/vc9/modules/modules.vcproj
EXTRA_DIST += Mkfiles/vc9/re2c/re2c.vcproj
EXTRA_DIST += Mkfiles/vc9/re2c/run.bat
-EXTRA_DIST += Mkfiles/vc9/genperf/genperf.vcproj
-EXTRA_DIST += Mkfiles/vc9/genperf/run.bat
+EXTRA_DIST += Mkfiles/vc10/config.h
+EXTRA_DIST += Mkfiles/vc10/crt_secure_no_deprecate.props
+EXTRA_DIST += Mkfiles/vc10/crt_secure_no_deprecate.vsprops
+EXTRA_DIST += Mkfiles/vc10/libyasm-stdint.h
+EXTRA_DIST += Mkfiles/vc10/readme.vc10.txt
+EXTRA_DIST += Mkfiles/vc10/vsyasm.props
+EXTRA_DIST += Mkfiles/vc10/vsyasm.targets
+EXTRA_DIST += Mkfiles/vc10/vsyasm.vcxproj
+EXTRA_DIST += Mkfiles/vc10/vsyasm.xml
+EXTRA_DIST += Mkfiles/vc10/yasm.sln
+EXTRA_DIST += Mkfiles/vc10/yasm.vcxproj
+EXTRA_DIST += Mkfiles/vc10/yasm.vcxproj.filters
+EXTRA_DIST += Mkfiles/vc10/ytasm.vcxproj
+EXTRA_DIST += Mkfiles/vc10/genmacro/genmacro.vcxproj
+EXTRA_DIST += Mkfiles/vc10/genmacro/genmacro.vcxproj.filters
+EXTRA_DIST += Mkfiles/vc10/genmacro/run.bat
+EXTRA_DIST += Mkfiles/vc10/genmodule/genmodule.vcxproj
+EXTRA_DIST += Mkfiles/vc10/genmodule/genmodule.vcxproj.filters
+EXTRA_DIST += Mkfiles/vc10/genmodule/run.bat
+EXTRA_DIST += Mkfiles/vc10/genperf/genperf.vcxproj
+EXTRA_DIST += Mkfiles/vc10/genperf/genperf.vcxproj.filters
+EXTRA_DIST += Mkfiles/vc10/genperf/run.bat
+EXTRA_DIST += Mkfiles/vc10/genstring/genstring.vcxproj
+EXTRA_DIST += Mkfiles/vc10/genstring/genstring.vcxproj.filters
+EXTRA_DIST += Mkfiles/vc10/genstring/run.bat
+EXTRA_DIST += Mkfiles/vc10/genversion/genversion.vcxproj
+EXTRA_DIST += Mkfiles/vc10/genversion/genversion.vcxproj.filters
+EXTRA_DIST += Mkfiles/vc10/genversion/run.bat
+EXTRA_DIST += Mkfiles/vc10/libyasm/libyasm.vcxproj
+EXTRA_DIST += Mkfiles/vc10/libyasm/libyasm.vcxproj.filters
+EXTRA_DIST += Mkfiles/vc10/modules/modules.vcxproj
+EXTRA_DIST += Mkfiles/vc10/modules/modules.vcxproj.filters
+EXTRA_DIST += Mkfiles/vc10/re2c/re2c.vcxproj
+EXTRA_DIST += Mkfiles/vc10/re2c/re2c.vcxproj.filters
+EXTRA_DIST += Mkfiles/vc10/re2c/run.bat
# Until this gets fixed in automake
DISTCLEANFILES += libyasm/stamp-h libyasm/stamp-h[0-9]*
-ACLOCAL_AMFLAGS = -I m4
-
distclean-local:
-rm -rf results
if HAVE_PYTHON
-rm -rf build
endif
+# Until gets fixed libyasm cross-build for target system
+# use fixinstall-yasm-XXX make targets
all-local: python-build
install-exec-hook: python-install
uninstall-hook: python-uninstall
if BUILD_MAN
-MAINTAINERCLEANFILES += $(dist_man_MANS)
+MAINTAINERCLEANFILES += $(dist_man_MANS) $(notrans_dist_man_MANS)
endif
# genstring build
« no previous file with comments | « third_party/yasm/patched-yasm/COPYING ('k') | third_party/yasm/patched-yasm/Makefile.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698