diff options
| author | Karl Berry <karl@freefriends.org> | 2016-01-20 16:04:02 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2016-01-20 16:04:02 +0000 |
| commit | ec3f350a5f0cf8d99840b96d956901b89e201513 (patch) | |
| tree | e4e097868903df7bd3ca445fc3f79b0b7fda77b2 /Build/source/libs/libpng | |
| parent | 415a631440d99d1c3d7f4f236c03bc34a265052b (diff) | |
Makefile.am (AM_CPPFLAGS): add LIBPNG_USER_CPPFLAGS for Mojca (tlbuild 17 Jan 2016 22:46:38)
git-svn-id: svn://tug.org/texlive/trunk@39436 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/libpng')
| -rw-r--r-- | Build/source/libs/libpng/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/libs/libpng/Makefile.am | 5 | ||||
| -rw-r--r-- | Build/source/libs/libpng/Makefile.in | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/Build/source/libs/libpng/ChangeLog b/Build/source/libs/libpng/ChangeLog index 466208698fb..a2d86e82d61 100644 --- a/Build/source/libs/libpng/ChangeLog +++ b/Build/source/libs/libpng/ChangeLog @@ -1,3 +1,8 @@ +2016-01-20 Karl Berry <karl@tug.org> + + * Makefile.am (AM_CPPFLAGS): add LIBPNG_USER_CPPFLAGS for Mojca. + http://tug.org/pipermail/tlbuild/2016q1/003327.html + 2016-01-15 Akira Kakuto <kakuto@fuk.kindai.ac.jp> Import libpng-1.6.21. diff --git a/Build/source/libs/libpng/Makefile.am b/Build/source/libs/libpng/Makefile.am index 6bb6c1726b7..805a6977de1 100644 --- a/Build/source/libs/libpng/Makefile.am +++ b/Build/source/libs/libpng/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to build libpng for TeX Live. ## -## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2016 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,8 @@ NEVER_NAMES += $(NEVER_NAMES_SUB) SUBDIRS = . include -AM_CPPFLAGS = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES) $(LIBPNG_DEFINES) +AM_CPPFLAGS = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES) \ + $(LIBPNG_DEFINES) $(LIBPNG_USER_CPPFLAGS) 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 cc01ba72aca..7d66dedf22c 100644 --- a/Build/source/libs/libpng/Makefile.in +++ b/Build/source/libs/libpng/Makefile.in @@ -569,7 +569,9 @@ NEVER_NAMES = -name .svn $(NEVER_NAMES_SUB) 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) +AM_CPPFLAGS = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES) \ + $(LIBPNG_DEFINES) $(LIBPNG_USER_CPPFLAGS) + AM_CFLAGS = $(VISIBILITY_CFLAGS) $(WARNING_CFLAGS) noinst_LIBRARIES = libpng.a nodist_libpng_a_SOURCES = \ |