summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/xetexdir/am/xetex.am
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/web2c/xetexdir/am/xetex.am')
-rw-r--r--Build/source/texk/web2c/xetexdir/am/xetex.am32
1 files changed, 5 insertions, 27 deletions
diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am
index b0970ce0c12..5250fd4dc88 100644
--- a/Build/source/texk/web2c/xetexdir/am/xetex.am
+++ b/Build/source/texk/web2c/xetexdir/am/xetex.am
@@ -24,9 +24,11 @@ xetex_cppflags += $(ICU_INCLUDES)
## freetype1/freetype2 confusion -- what a mess.
xetex_cppflags += $(FREETYPE2_INCLUDES)
xetex_cppflags += $(TECKIT_INCLUDES)
-xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS)
+xetex_cppflags += $(HARFBUZZ_INCLUDES)
+xetex_cppflags += $(GRAPHITE2_INCLUDES)
+xetex_ldadd = $(libxetex) $(HARFBUZZ_LIBS) $(GRAPHITE2_LIBS) $(ICU_LIBS) $(TECKIT_LIBS)
xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND)
-xetex_dependencies += $(ICU_DEPEND) $(TECKIT_DEPEND)
+xetex_dependencies += $(ICU_DEPEND) $(TECKIT_DEPEND) $(HARFBUZZ_DEPEND) $(GRAPHITE2_DEPEND)
if XETEX_MACOSX
@@ -42,14 +44,6 @@ xetex_dependencies += $(POPPLER_DEPEND) $(LIBPNG_DEPEND)
endif !XETEX_MACOSX
-if XETEX_GRAPHITE
-
-xetex_cppflags += -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES)
-xetex_ldadd += $(GRAPHITE_LIBS)
-xetex_dependencies += $(GRAPHITE_DEPEND)
-
-endif XETEX_GRAPHITE
-
xetex_cppflags += $(ZLIB_INCLUDES)
xetex_ldadd += $(FREETYPE2_LIBS) $(ZLIB_LIBS)
xetex_dependencies += $(FREETYPE2_DEPEND) $(ZLIB_DEPEND)
@@ -183,15 +177,11 @@ libxetex_a_SOURCES = \
xetexdir/XeTeXFontMgr.h \
xetexdir/XeTeXLayoutInterface.cpp \
xetexdir/XeTeXLayoutInterface.h \
- xetexdir/XeTeXOTLayoutEngine.cpp \
- xetexdir/XeTeXOTLayoutEngine.h \
xetexdir/XeTeXOTMath.cpp \
xetexdir/XeTeXOTMath.h \
xetexdir/XeTeX_ext.c \
xetexdir/XeTeX_ext.h \
xetexdir/XeTeXswap.h \
- xetexdir/cmaps.cpp \
- xetexdir/cmaps.h \
xetexdir/sfnt.h \
xetexdir/trans.c \
xetexdir/trans.h \
@@ -220,10 +210,6 @@ libxetex_a_SOURCES += \
xetexdir/bmpimage.h \
xetexdir/jpegimage.c \
xetexdir/jpegimage.h \
- xetexdir/mfileio.c \
- xetexdir/mfileio.h \
- xetexdir/numbers.c \
- xetexdir/numbers.h \
xetexdir/pdfimage.cpp \
xetexdir/pdfimage.h \
xetexdir/pngimage.c \
@@ -231,14 +217,6 @@ libxetex_a_SOURCES += \
endif !XETEX_MACOSX
-if XETEX_GRAPHITE
-
-libxetex_a_SOURCES += \
- xetexdir/XeTeXGrLayout.cpp \
- xetexdir/XeTeXGrLayout.h
-
-endif XETEX_GRAPHITE
-
# We must create xetexd.h etc. before building the libxetex_a_OBJECTS.
libxetex_prereq = xetexd.h $(xetex_dependencies)
$(libxetex_a_OBJECTS): $(libxetex_prereq)
@@ -257,5 +235,5 @@ endif XETEX
## Not used
##
-EXTRA_DIST += xetexdir/LICENSE.txt
+EXTRA_DIST += xetexdir/COPYING