summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-02-14 17:11:10 +0000
committerKarl Berry <karl@freefriends.org>2019-02-14 17:11:10 +0000
commitce4f33d8000bb1e4d800983e105d0052a545e327 (patch)
tree00ca62d37f87cc271e57be4be60e7f398e82e51f /Build
parent23c0b114627df50541db9d3f41bcff9791d22674 (diff)
compile palette_neon_intrinsics.c for neon
git-svn-id: svn://tug.org/texlive/trunk@50024 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/libs/libpng/ChangeLog6
-rw-r--r--Build/source/libs/libpng/Makefile.am3
-rw-r--r--Build/source/libs/libpng/Makefile.in15
3 files changed, 20 insertions, 4 deletions
diff --git a/Build/source/libs/libpng/ChangeLog b/Build/source/libs/libpng/ChangeLog
index d46f26fabb7..ee5ca7689c2 100644
--- a/Build/source/libs/libpng/ChangeLog
+++ b/Build/source/libs/libpng/ChangeLog
@@ -1,3 +1,9 @@
+2019-02-14 Johannes Hielscher <jhielscher@posteo.de>
+
+ * Makefile.am (nodist_libpng_a_SOURCES) [PNG_ARM_NEON]: include
+ @LIBPNG_TREE@/arm/palette_neon_intrinsics.c.
+ tlbuild 12 Feb 2019 00:07:11.
+
2018-12-02 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
Import libpng-1.6.36.
diff --git a/Build/source/libs/libpng/Makefile.am b/Build/source/libs/libpng/Makefile.am
index b4c39ba2ffd..cf057b45367 100644
--- a/Build/source/libs/libpng/Makefile.am
+++ b/Build/source/libs/libpng/Makefile.am
@@ -45,7 +45,8 @@ nodist_libpng_a_SOURCES = \
if PNG_ARM_NEON
nodist_libpng_a_SOURCES += @LIBPNG_TREE@/arm/arm_init.c\
- @LIBPNG_TREE@/arm/filter_neon.S @LIBPNG_TREE@/arm/filter_neon_intrinsics.c
+ @LIBPNG_TREE@/arm/filter_neon.S @LIBPNG_TREE@/arm/filter_neon_intrinsics.c \
+ @LIBPNG_TREE@/arm/palette_neon_intrinsics.c
endif
$(libpng_a_OBJECTS): config.force
diff --git a/Build/source/libs/libpng/Makefile.in b/Build/source/libs/libpng/Makefile.in
index c7da7783765..e4abeb1c4ad 100644
--- a/Build/source/libs/libpng/Makefile.in
+++ b/Build/source/libs/libpng/Makefile.in
@@ -87,7 +87,8 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
@PNG_ARM_NEON_TRUE@am__append_1 = @LIBPNG_TREE@/arm/arm_init.c\
-@PNG_ARM_NEON_TRUE@ @LIBPNG_TREE@/arm/filter_neon.S @LIBPNG_TREE@/arm/filter_neon_intrinsics.c
+@PNG_ARM_NEON_TRUE@ @LIBPNG_TREE@/arm/filter_neon.S @LIBPNG_TREE@/arm/filter_neon_intrinsics.c \
+@PNG_ARM_NEON_TRUE@ @LIBPNG_TREE@/arm/palette_neon_intrinsics.c
@build_TRUE@check_PROGRAMS = pngtest$(EXEEXT)
subdir = .
@@ -121,7 +122,8 @@ am__dirstamp = $(am__leading_dot)dirstamp
@PNG_ARM_NEON_TRUE@am__objects_1 = \
@PNG_ARM_NEON_TRUE@ @LIBPNG_TREE@/arm/arm_init.$(OBJEXT) \
@PNG_ARM_NEON_TRUE@ @LIBPNG_TREE@/arm/filter_neon.$(OBJEXT) \
-@PNG_ARM_NEON_TRUE@ @LIBPNG_TREE@/arm/filter_neon_intrinsics.$(OBJEXT)
+@PNG_ARM_NEON_TRUE@ @LIBPNG_TREE@/arm/filter_neon_intrinsics.$(OBJEXT) \
+@PNG_ARM_NEON_TRUE@ @LIBPNG_TREE@/arm/palette_neon_intrinsics.$(OBJEXT)
nodist_libpng_a_OBJECTS = @LIBPNG_TREE@/png.$(OBJEXT) \
@LIBPNG_TREE@/pngerror.$(OBJEXT) \
@LIBPNG_TREE@/pngget.$(OBJEXT) @LIBPNG_TREE@/pngmem.$(OBJEXT) \
@@ -174,7 +176,8 @@ am__depfiles_remade = @LIBPNG_TREE@/$(DEPDIR)/png.Po \
@LIBPNG_TREE@/$(DEPDIR)/pngwutil.Po \
@LIBPNG_TREE@/arm/$(DEPDIR)/arm_init.Po \
@LIBPNG_TREE@/arm/$(DEPDIR)/filter_neon.Po \
- @LIBPNG_TREE@/arm/$(DEPDIR)/filter_neon_intrinsics.Po
+ @LIBPNG_TREE@/arm/$(DEPDIR)/filter_neon_intrinsics.Po \
+ @LIBPNG_TREE@/arm/$(DEPDIR)/palette_neon_intrinsics.Po
am__mv = mv -f
CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS)
@@ -744,6 +747,9 @@ clean-noinstLIBRARIES:
@LIBPNG_TREE@/arm/filter_neon_intrinsics.$(OBJEXT): \
@LIBPNG_TREE@/arm/$(am__dirstamp) \
@LIBPNG_TREE@/arm/$(DEPDIR)/$(am__dirstamp)
+@LIBPNG_TREE@/arm/palette_neon_intrinsics.$(OBJEXT): \
+ @LIBPNG_TREE@/arm/$(am__dirstamp) \
+ @LIBPNG_TREE@/arm/$(DEPDIR)/$(am__dirstamp)
libpng.a: $(libpng_a_OBJECTS) $(libpng_a_DEPENDENCIES) $(EXTRA_libpng_a_DEPENDENCIES)
$(AM_V_at)-rm -f libpng.a
@@ -783,6 +789,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/arm/$(DEPDIR)/arm_init.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/arm/$(DEPDIR)/filter_neon.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/arm/$(DEPDIR)/filter_neon_intrinsics.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/arm/$(DEPDIR)/palette_neon_intrinsics.Po@am__quote@ # am--include-marker
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
@@ -1351,6 +1358,7 @@ distclean: distclean-recursive
-rm -f @LIBPNG_TREE@/arm/$(DEPDIR)/arm_init.Po
-rm -f @LIBPNG_TREE@/arm/$(DEPDIR)/filter_neon.Po
-rm -f @LIBPNG_TREE@/arm/$(DEPDIR)/filter_neon_intrinsics.Po
+ -rm -f @LIBPNG_TREE@/arm/$(DEPDIR)/palette_neon_intrinsics.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-tags
@@ -1417,6 +1425,7 @@ maintainer-clean: maintainer-clean-recursive
-rm -f @LIBPNG_TREE@/arm/$(DEPDIR)/arm_init.Po
-rm -f @LIBPNG_TREE@/arm/$(DEPDIR)/filter_neon.Po
-rm -f @LIBPNG_TREE@/arm/$(DEPDIR)/filter_neon_intrinsics.Po
+ -rm -f @LIBPNG_TREE@/arm/$(DEPDIR)/palette_neon_intrinsics.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic