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

Unified Diff: third_party/ots/Makefile.am

Issue 1252363005: Update OTS to revision a7a3b94 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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/ots/INSTALL ('k') | third_party/ots/README.chromium » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/ots/Makefile.am
diff --git a/third_party/ots/Makefile.am b/third_party/ots/Makefile.am
index 6af4c29c17219a0ec7125b8e14ac5bbedd9066f9..45361117fcd0810a9be0446b3cd3b3a3c25f7510 100644
--- a/third_party/ots/Makefile.am
+++ b/third_party/ots/Makefile.am
@@ -1,5 +1,7 @@
NULL =
+ACLOCAL_AMFLAGS = -I m4
+
bin_PROGRAMS = \
ot-sanitise \
$(NULL)
@@ -25,9 +27,12 @@ TESTS = \
cff_type2_charstring_test \
layout_common_table_test \
table_dependencies_test \
- tests/test_unmalicious_fonts.sh \
$(NULL)
+if HAVE_FREETYPE
+TESTS += tests/test_unmalicious_fonts.sh
+endif
+
check_PROGRAMS = \
cff_type2_charstring_test \
layout_common_table_test \
@@ -120,9 +125,12 @@ libbrotli_a_SOURCES = \
third_party/brotli/dec/dictionary.h \
third_party/brotli/dec/huffman.c \
third_party/brotli/dec/huffman.h \
+ third_party/brotli/dec/port.h \
third_party/brotli/dec/prefix.h \
third_party/brotli/dec/safe_malloc.c \
third_party/brotli/dec/safe_malloc.h \
+ third_party/brotli/dec/state.c \
+ third_party/brotli/dec/state.h \
third_party/brotli/dec/streams.c \
third_party/brotli/dec/streams.h \
third_party/brotli/dec/transform.h \
@@ -133,6 +141,7 @@ libbrotli_a_SOURCES = \
ot_sanitise_SOURCES = \
util/ot-sanitise.cc \
util/file-stream.h \
+ util/test-context.h \
$(NULL)
@@ -143,6 +152,7 @@ perf_SOURCES = \
idempotent_SOURCES = \
util/idempotent.cc \
+ util/test-context.h \
$(NULL)
@@ -229,6 +239,15 @@ AM_TESTS_ENVIRONMENT = \
$(NULL)
+EXTRA_DIST = \
+ LICENSE \
+ tests/BLACKLIST.txt \
+ tests/test_unmalicious_fonts.sh \
+ third_party/brotli/LICENSE \
+ third_party/gtest \
+ $(NULL)
+
+
MAINTAINERCLEANFILES = \
$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
$(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \
« no previous file with comments | « third_party/ots/INSTALL ('k') | third_party/ots/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698