summaryrefslogtreecommitdiff
path: root/Build/source/texk/xdvipdfmx/src
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/xdvipdfmx/src')
-rw-r--r--Build/source/texk/xdvipdfmx/src/Makefile.am7
-rw-r--r--Build/source/texk/xdvipdfmx/src/Makefile.in14
2 files changed, 19 insertions, 2 deletions
diff --git a/Build/source/texk/xdvipdfmx/src/Makefile.am b/Build/source/texk/xdvipdfmx/src/Makefile.am
index 69e2224e89a..e022614adb0 100644
--- a/Build/source/texk/xdvipdfmx/src/Makefile.am
+++ b/Build/source/texk/xdvipdfmx/src/Makefile.am
@@ -33,6 +33,13 @@ xdvipdfmx_DEPENDENCIES = $(KPATHSEA_DEPEND) $(FREETYPE2_DEPEND) $(LIBPNG_DEPEND)
LDADD = $(KPATHSEA_LIBS) $(FREETYPE2_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS)
+if build_MacOsX
+AM_LDFLAGS = -framework ApplicationServices
+else !build_MacOsX
+INCLUDES += $(FONTCONFIG_INCLUDES)
+LDADD += $(FONTCONFIG_LIBS)
+endif !build_MacOsX
+
## Rebuild libkpathsea
@KPATHSEA_RULE@
## Rebuild libfreetype
diff --git a/Build/source/texk/xdvipdfmx/src/Makefile.in b/Build/source/texk/xdvipdfmx/src/Makefile.in
index 61f193c54c5..3520c4bb0b8 100644
--- a/Build/source/texk/xdvipdfmx/src/Makefile.in
+++ b/Build/source/texk/xdvipdfmx/src/Makefile.in
@@ -35,12 +35,15 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = xdvipdfmx$(EXEEXT)
+@build_MacOsX_FALSE@am__append_1 = $(FONTCONFIG_INCLUDES)
+@build_MacOsX_FALSE@am__append_2 = $(FONTCONFIG_LIBS)
subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/cho-kpse.m4 \
$(top_srcdir)/../../m4/cho-libs.m4 \
$(top_srcdir)/../../m4/kpse-common.m4 \
+ $(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
@@ -87,6 +90,7 @@ am_xdvipdfmx_OBJECTS = agl.$(OBJEXT) agl_standard.$(OBJEXT) \
xdvipdfmx_OBJECTS = $(am_xdvipdfmx_OBJECTS)
xdvipdfmx_LDADD = $(LDADD)
am__DEPENDENCIES_1 =
+@build_MacOsX_FALSE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
am__depfiles_maybe = depfiles
@@ -128,6 +132,8 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+FONTCONFIG_INCLUDES = @FONTCONFIG_INCLUDES@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
FREETYPE2_LIBS = @FREETYPE2_LIBS@
@@ -168,6 +174,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
@@ -229,7 +236,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES)
+INCLUDES = $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) \
+ $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(am__append_1)
AM_CPPFLAGS =
xdvipdfmx_SOURCES = \
agl.c agl_standard.c bmpimage.c cff.c cff_dict.c cid.c cidtype0.c cidtype2.c \
@@ -257,7 +265,9 @@ xdvipdfmx_SOURCES = \
unicode.h vf.h xbb.h
xdvipdfmx_DEPENDENCIES = $(KPATHSEA_DEPEND) $(FREETYPE2_DEPEND) $(LIBPNG_DEPEND) $(ZLIB_DEPEND)
-LDADD = $(KPATHSEA_LIBS) $(FREETYPE2_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS)
+LDADD = $(KPATHSEA_LIBS) $(FREETYPE2_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) \
+ $(am__append_2)
+@build_MacOsX_TRUE@AM_LDFLAGS = -framework ApplicationServices
EXTRA_DIST = mk_agl_standard_c.pl Makefile.am.orig
all: all-am