diff options
author | Karl Berry <karl@freefriends.org> | 2018-08-31 23:11:41 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-08-31 23:11:41 +0000 |
commit | 8ba2cf02688200d56e4fe0839a451ef832ce15b6 (patch) | |
tree | fcec1a50903a6e5b939859a1f92e15342636f290 /Build/source/texk/dvisvgm/dvisvgm-src/src/Makefile.am | |
parent | 5d0960aa5419651a9c9b6503e44be2f098831ef1 (diff) |
dvisvgm 2.5, including potrace now bundled with dvisvgm instead of under libs/
git-svn-id: svn://tug.org/texlive/trunk@48527 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvisvgm/dvisvgm-src/src/Makefile.am')
-rw-r--r-- | Build/source/texk/dvisvgm/dvisvgm-src/src/Makefile.am | 44 |
1 files changed, 37 insertions, 7 deletions
diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/src/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-src/src/Makefile.am index e073594a218..cd668737062 100644 --- a/Build/source/texk/dvisvgm/dvisvgm-src/src/Makefile.am +++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Makefile.am @@ -12,19 +12,34 @@ dvisvgm_SOURCES = \ dvisvgm_LDADD = \ $(noinst_LIBRARIES) \ - ../libs/clipper/libclipper.a \ + ../libs/clipper/libclipper.a + +if USE_BUNDLED_LIBS +dvisvgm_LDADD += \ + ../libs/potrace/libpotrace.a \ ../libs/xxHash/libxxhash.a +else +dvisvgm_LDADD += \ + $(POTRACE_LIBS) \ + $(XXHASH_LIBS) +endif if ENABLE_WOFF +if USE_BUNDLED_LIBS dvisvgm_LDADD += \ ../libs/ff-woff/libfontforge.a \ ../libs/woff2/libwoff2.a \ ../libs/brotli/libbrotli.a +else +dvisvgm_LDADD += \ + ../libs/ff-woff/libfontforge.a \ + $(WOFF2_LIBS) \ + $(BROTLI_LIBS) +endif endif dvisvgm_LDADD += \ $(KPATHSEA_LIBS) \ - $(POTRACE_LIBS) \ $(FREETYPE2_LIBS) \ $(FONTFORGE_LIBS) \ $(ZLIB_LIBS) \ @@ -257,12 +272,22 @@ AM_CFLAGS = $(WARNING_CFLAGS) \ $(ZLIB_INCLUDES) \ $(CODE_COVERAGE_CFLAGS) -AM_CXXFLAGS = $(WARNING_CFLAGS) -Wnon-virtual-dtor \ +AM_CXXFLAGS = $(WARNING_CFLAGS) -Wnon-virtual-dtor -Wno-mismatched-tags \ -I$(dvisvgm_srcdir)/libs/clipper \ - -I$(dvisvgm_srcdir)/libs/variant/include \ + -I$(dvisvgm_srcdir)/libs/variant/include + +if USE_BUNDLED_LIBS +AM_CXXFLAGS += \ + -I$(dvisvgm_srcdir)/libs/potrace \ -I$(dvisvgm_srcdir)/libs/xxHash +else +AM_CXXFLAGS += \ + $(POTRACE_CFLAGS) \ + $(XXHASH_CFLAGS) +endif AM_LDFLAGS = \ + $(KPSE_LIBS) \ $(CODE_COVERAGE_LDFLAGS) if ENABLE_WOFF @@ -270,10 +295,17 @@ AM_CFLAGS += \ -I$(dvisvgm_srcdir)/libs/ff-woff/fontforge \ -I$(dvisvgm_srcdir)/libs/ff-woff/inc +AM_CXXFLAGS += $(TTFAUTOHINT_CFLAGS) + +if USE_BUNDLED_LIBS AM_CXXFLAGS += \ - $(TTFAUTOHINT_CFLAGS) \ -I$(dvisvgm_srcdir)/libs/brotli/include \ -I$(dvisvgm_srcdir)/libs/woff2/include +else +AM_CXXFLAGS += \ + $(BROTLI_CFLAGS) \ + $(WOFF2_CFLAGS) +endif AM_LDFLAGS += $(TTFAUTOHINT_LIBS) endif @@ -312,8 +344,6 @@ CLEANFILES = *.gcda *.gcno ## Rebuild libkpathsea @KPATHSEA_RULE@ -## Rebuild libpotrace -@POTRACE_RULE@ ## Rebuild libfreetype @FREETYPE2_RULE@ ## Rebuild libz |