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.am71
1 files changed, 41 insertions, 30 deletions
diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am
index ef7683209c7..4bdc8b63e5c 100644
--- a/Build/source/texk/web2c/xetexdir/am/xetex.am
+++ b/Build/source/texk/web2c/xetexdir/am/xetex.am
@@ -26,9 +26,28 @@ xetex_cppflags += $(FREETYPE2_INCLUDES)
xetex_cppflags += $(TECKIT_INCLUDES)
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) $(HARFBUZZ_DEPEND) $(GRAPHITE2_DEPEND)
+xetex_cppflags += $(POPPLER_INCLUDES)
+xetex_cppflags += $(LIBPNG_INCLUDES)
+xetex_cppflags += $(ZLIB_INCLUDES)
+xetex_ldadd = $(libxetex)
+xetex_ldadd += $(HARFBUZZ_LIBS)
+xetex_ldadd += $(GRAPHITE2_LIBS)
+xetex_ldadd += $(ICU_LIBS)
+xetex_ldadd += $(TECKIT_LIBS)
+xetex_ldadd += $(POPPLER_LIBS)
+xetex_ldadd += $(LIBPNG_LIBS)
+xetex_ldadd += $(FREETYPE2_LIBS)
+xetex_ldadd += $(ZLIB_LIBS)
+xetex_dependencies = $(proglib)
+xetex_dependencies += $(KPATHSEA_DEPEND)
+xetex_dependencies += $(ICU_DEPEND)
+xetex_dependencies += $(TECKIT_DEPEND)
+xetex_dependencies += $(HARFBUZZ_DEPEND)
+xetex_dependencies += $(GRAPHITE2_DEPEND)
+xetex_dependencies += $(POPPLER_DEPEND)
+xetex_dependencies += $(LIBPNG_DEPEND)
+xetex_dependencies += $(FREETYPE2_DEPEND)
+xetex_dependencies += $(ZLIB_DEPEND)
if XETEX_MACOSX
@@ -37,16 +56,11 @@ xetex_LDFLAGS = -framework ApplicationServices -framework Cocoa
else !XETEX_MACOSX
-xetex_cppflags += -DXETEX_OTHER
-xetex_cppflags += $(POPPLER_INCLUDES) $(LIBPNG_INCLUDES) $(FONTCONFIG_INCLUDES)
-xetex_ldadd += $(POPPLER_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS)
-xetex_dependencies += $(POPPLER_DEPEND) $(LIBPNG_DEPEND)
+xetex_cppflags += $(FONTCONFIG_INCLUDES)
+xetex_ldadd += $(FONTCONFIG_LIBS)
endif !XETEX_MACOSX
-xetex_cppflags += $(ZLIB_INCLUDES)
-xetex_ldadd += $(FREETYPE2_LIBS) $(ZLIB_LIBS)
-xetex_dependencies += $(FREETYPE2_DEPEND) $(ZLIB_DEPEND)
xetex_CPPFLAGS = $(xetex_cppflags)
xetex_CFLAGS = # $(WARNING_CFLAGS)
@@ -107,8 +121,6 @@ EXTRA_DIST += $(xetex_web_srcs) $(xetex_ch_srcs) xetexdir/xetex.defines
DISTCLEANFILES += $(nodist_xetex_SOURCES) xetex.web xetex.ch xetex-web2c \
xetex.p xetex.pool xetex-tangle
-EXTRA_DIST += \
- xetexdir/unicode-char-prep.pl
## libxetex
##
@@ -131,11 +143,24 @@ libxetex_a_SOURCES = \
xetexdir/XeTeXOTMath.h \
xetexdir/XeTeX_ext.c \
xetexdir/XeTeX_ext.h \
+ xetexdir/XeTeX_pic.c \
xetexdir/XeTeXswap.h \
xetexdir/trans.c \
xetexdir/trans.h \
xetexdir/hz.cpp \
- xetexdir/xetex.h
+ xetexdir/xetex.h \
+ xetexdir/pdfimage.cpp \
+ xetexdir/pdfimage.h \
+ xetexdir/image/bmpimage.c \
+ xetexdir/image/bmpimage.h \
+ xetexdir/image/jpegimage.c \
+ xetexdir/image/jpegimage.h \
+ xetexdir/image/mfileio.c \
+ xetexdir/image/mfileio.h \
+ xetexdir/image/numbers.c \
+ xetexdir/image/numbers.h \
+ xetexdir/image/pngimage.c \
+ xetexdir/image/pngimage.h
if XETEX_MACOSX
@@ -150,20 +175,7 @@ else !XETEX_MACOSX
libxetex_a_SOURCES += \
xetexdir/XeTeXFontMgr_FC.cpp \
- xetexdir/XeTeXFontMgr_FC.h \
- xetexdir/XeTeX_pic.c \
- xetexdir/pdfimage.cpp \
- xetexdir/pdfimage.h \
- xetexdir/image/bmpimage.c \
- xetexdir/image/bmpimage.h \
- xetexdir/image/jpegimage.c \
- xetexdir/image/jpegimage.h \
- xetexdir/image/mfileio.c \
- xetexdir/image/mfileio.h \
- xetexdir/image/numbers.c \
- xetexdir/image/numbers.h \
- xetexdir/image/pngimage.c \
- xetexdir/image/pngimage.h
+ xetexdir/XeTeXFontMgr_FC.h
endif !XETEX_MACOSX
@@ -171,7 +183,6 @@ endif !XETEX_MACOSX
libxetex_prereq = xetexd.h $(xetex_dependencies)
$(libxetex_a_OBJECTS): $(libxetex_prereq)
-EXTRA_DIST += xetexdir/ChangeLog
# XeTeX Tests
#
@@ -183,9 +194,9 @@ if XETEX
TESTS += $(xetex_tests)
endif XETEX
-## Not used
-##
EXTRA_DIST += \
+ xetexdir/unicode-char-prep.pl \
+ xetexdir/ChangeLog \
xetexdir/COPYING \
xetexdir/NEWS \
xetexdir/image/README \