summaryrefslogtreecommitdiff
path: root/Build/source/libs
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-09-06 20:40:04 +0000
committerKarl Berry <karl@freefriends.org>2018-09-06 20:40:04 +0000
commit13792a99bfc4b87b56aef415fca45eb003df39da (patch)
tree84efb8ad518336bc74dcfb23d975fe19f34cdf03 /Build/source/libs
parent705f7808933ffd8982d71e29af8d5aa6647eacb9 (diff)
reac
git-svn-id: svn://tug.org/texlive/trunk@48600 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs')
-rwxr-xr-xBuild/source/libs/configure6
-rw-r--r--Build/source/libs/luajit/native/Makefile.in28
2 files changed, 22 insertions, 12 deletions
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 10051f841a5..16d0ceff378 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -3850,8 +3850,6 @@ case $enable_luatex in #(
esac
test "x$enable_web2c:$enable_luatex" = xyes:yes && {
- need_poppler=yes
- need_mpfr=yes
need_libpng=yes
need_zziplib=yes
need_lua52=yes
@@ -3868,8 +3866,6 @@ case $enable_luatex53 in #(
esac
test "x$enable_web2c:$enable_luatex53" = xyes:yes && {
- need_poppler=yes
- need_mpfr=yes
need_libpng=yes
need_zziplib=yes
need_lua53=yes
@@ -3886,8 +3882,6 @@ case $enable_luajittex in #(
esac
test "x$enable_web2c:$enable_luajittex" = xyes:yes && {
- need_poppler=yes
- need_mpfr=yes
need_libpng=yes
need_zziplib=yes
need_luajit=yes
diff --git a/Build/source/libs/luajit/native/Makefile.in b/Build/source/libs/luajit/native/Makefile.in
index a91cdc6a6df..31b4cd28d3d 100644
--- a/Build/source/libs/luajit/native/Makefile.in
+++ b/Build/source/libs/luajit/native/Makefile.in
@@ -114,7 +114,8 @@ nodist_buildvm_OBJECTS = \
@LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.$(OBJEXT)
buildvm_OBJECTS = $(nodist_buildvm_OBJECTS)
buildvm_LDADD = $(LDADD)
-nodist_minilua_OBJECTS = @LUAJIT_TREE@/src/host/minilua.$(OBJEXT)
+nodist_minilua_OBJECTS = \
+ @LUAJIT_TREE@/src/host/minilua-minilua.$(OBJEXT)
minilua_OBJECTS = $(nodist_minilua_OBJECTS)
am__DEPENDENCIES_1 =
minilua_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -139,7 +140,7 @@ am__depfiles_remade = \
@LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_fold.Po \
@LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_lib.Po \
@LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_peobj.Po \
- @LUAJIT_TREE@/src/host/$(DEPDIR)/minilua.Po
+ @LUAJIT_TREE@/src/host/$(DEPDIR)/minilua-minilua.Po
am__mv = mv -f
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -329,6 +330,7 @@ nodist_buildvm_SOURCES = \
@LUAJIT_TREE@/src/host/buildvm_lib.c \
@LUAJIT_TREE@/src/host/buildvm_peobj.c
+minilua_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_DEFINES) `cat ../native_flags`
nodist_minilua_SOURCES = \
@LUAJIT_TREE@/src/host/minilua.c
@@ -412,7 +414,7 @@ distclean-hdr:
buildvm$(EXEEXT): $(buildvm_OBJECTS) $(buildvm_DEPENDENCIES) $(EXTRA_buildvm_DEPENDENCIES)
@rm -f buildvm$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(buildvm_OBJECTS) $(buildvm_LDADD) $(LIBS)
-@LUAJIT_TREE@/src/host/minilua.$(OBJEXT): \
+@LUAJIT_TREE@/src/host/minilua-minilua.$(OBJEXT): \
@LUAJIT_TREE@/src/host/$(am__dirstamp) \
@LUAJIT_TREE@/src/host/$(DEPDIR)/$(am__dirstamp)
@@ -432,7 +434,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_fold.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_lib.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_peobj.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/host/$(DEPDIR)/minilua.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/host/$(DEPDIR)/minilua-minilua.Po@am__quote@ # am--include-marker
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
@@ -526,6 +528,20 @@ am--depfiles: $(am__depfiles_remade)
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_peobj.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_peobj.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_peobj.c'; fi`
+@LUAJIT_TREE@/src/host/minilua-minilua.o: @LUAJIT_TREE@/src/host/minilua.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(minilua_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/minilua-minilua.o -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/minilua-minilua.Tpo -c -o @LUAJIT_TREE@/src/host/minilua-minilua.o `test -f '@LUAJIT_TREE@/src/host/minilua.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/minilua.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) @LUAJIT_TREE@/src/host/$(DEPDIR)/minilua-minilua.Tpo @LUAJIT_TREE@/src/host/$(DEPDIR)/minilua-minilua.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='@LUAJIT_TREE@/src/host/minilua.c' object='@LUAJIT_TREE@/src/host/minilua-minilua.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(minilua_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/minilua-minilua.o `test -f '@LUAJIT_TREE@/src/host/minilua.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/minilua.c
+
+@LUAJIT_TREE@/src/host/minilua-minilua.obj: @LUAJIT_TREE@/src/host/minilua.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(minilua_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/minilua-minilua.obj -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/minilua-minilua.Tpo -c -o @LUAJIT_TREE@/src/host/minilua-minilua.obj `if test -f '@LUAJIT_TREE@/src/host/minilua.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/minilua.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/minilua.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) @LUAJIT_TREE@/src/host/$(DEPDIR)/minilua-minilua.Tpo @LUAJIT_TREE@/src/host/$(DEPDIR)/minilua-minilua.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='@LUAJIT_TREE@/src/host/minilua.c' object='@LUAJIT_TREE@/src/host/minilua-minilua.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(minilua_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/minilua-minilua.obj `if test -f '@LUAJIT_TREE@/src/host/minilua.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/minilua.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/minilua.c'; fi`
+
ID: $(am__tagged_files)
$(am__define_uniq_tagged_files); mkid -fID $$unique
tags: tags-am
@@ -799,7 +815,7 @@ distclean: distclean-am
-rm -f @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_fold.Po
-rm -f @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_lib.Po
-rm -f @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_peobj.Po
- -rm -f @LUAJIT_TREE@/src/host/$(DEPDIR)/minilua.Po
+ -rm -f @LUAJIT_TREE@/src/host/$(DEPDIR)/minilua-minilua.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-tags
@@ -852,7 +868,7 @@ maintainer-clean: maintainer-clean-am
-rm -f @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_fold.Po
-rm -f @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_lib.Po
-rm -f @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_peobj.Po
- -rm -f @LUAJIT_TREE@/src/host/$(DEPDIR)/minilua.Po
+ -rm -f @LUAJIT_TREE@/src/host/$(DEPDIR)/minilua-minilua.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic