summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-03-29 22:17:55 +0000
committerKarl Berry <karl@freefriends.org>2016-03-29 22:17:55 +0000
commita5ac56eb72589aa41d06cde50b873ba3f37eaf78 (patch)
treec7a1bfd228c7803ee626c0ca0dacf00b1450df49 /Build
parent61c652c6ab0d56352e59455266ca1d649ba244d6 (diff)
remove LIBPNG_USER_CPPFLAGS
git-svn-id: svn://tug.org/texlive/trunk@40178 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/libs/libpng/ChangeLog5
-rw-r--r--Build/source/libs/libpng/Makefile.am2
-rw-r--r--Build/source/libs/libpng/Makefile.in2
3 files changed, 7 insertions, 2 deletions
diff --git a/Build/source/libs/libpng/ChangeLog b/Build/source/libs/libpng/ChangeLog
index 84d1018da13..7f8e29ffbbd 100644
--- a/Build/source/libs/libpng/ChangeLog
+++ b/Build/source/libs/libpng/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-30 Karl Berry <karl@tug.org>
+
+ * Makefile.am (AM_CPPFLAGS): remove LIBPNG_USER_CPPFLAGS per Mojca.
+ http://tug.org/pipermail/tlbuild/2016q1/003440.html
+
2016-03-28 Karl Berry <karl@tug.org>
* configure.ac: insert check for -std=c89 from Mojca.
diff --git a/Build/source/libs/libpng/Makefile.am b/Build/source/libs/libpng/Makefile.am
index 3141c432de1..c0e6bae3b63 100644
--- a/Build/source/libs/libpng/Makefile.am
+++ b/Build/source/libs/libpng/Makefile.am
@@ -22,7 +22,7 @@ NEVER_NAMES += $(NEVER_NAMES_SUB)
SUBDIRS = . include
AM_CPPFLAGS = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES) \
- $(LIBPNG_DEFINES) $(LIBPNG_USER_CPPFLAGS)
+ $(LIBPNG_DEFINES)
AM_CFLAGS = $(VISIBILITY_CFLAGS) $(WARNING_CFLAGS)
noinst_LIBRARIES=libpng.a
diff --git a/Build/source/libs/libpng/Makefile.in b/Build/source/libs/libpng/Makefile.in
index e780b5bd01f..e38bbc21750 100644
--- a/Build/source/libs/libpng/Makefile.in
+++ b/Build/source/libs/libpng/Makefile.in
@@ -570,7 +570,7 @@ NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'
NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
SUBDIRS = . include
AM_CPPFLAGS = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES) \
- $(LIBPNG_DEFINES) $(LIBPNG_USER_CPPFLAGS)
+ $(LIBPNG_DEFINES)
AM_CFLAGS = $(VISIBILITY_CFLAGS) $(WARNING_CFLAGS)
noinst_LIBRARIES = libpng.a