summaryrefslogtreecommitdiff
path: root/Build/source/libs/gd/include
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-06-24 09:01:02 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-06-24 09:01:02 +0000
commitcd573af8ce5db24aae95c942b2ba505ca0a3338f (patch)
treeac38fcc8f72bccacd785ca6f74835e1f976334e1 /Build/source/libs/gd/include
parent6c998f4d3d5f21632bc1d2c87073afa9e6b9fc70 (diff)
gd 2.1.0-rc1 (libgd)
git-svn-id: svn://tug.org/texlive/trunk@30886 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/gd/include')
-rw-r--r--Build/source/libs/gd/include/Makefile.am10
-rw-r--r--Build/source/libs/gd/include/Makefile.in71
2 files changed, 55 insertions, 26 deletions
diff --git a/Build/source/libs/gd/include/Makefile.am b/Build/source/libs/gd/include/Makefile.am
index 96940a3bd16..35efdc31300 100644
--- a/Build/source/libs/gd/include/Makefile.am
+++ b/Build/source/libs/gd/include/Makefile.am
@@ -1,16 +1,18 @@
## Proxy Makefile.am to install headers headers for TeX Live.
##
-## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
## with or without modifications, as long as this notice is preserved.
##
-GD_SRC = $(top_srcdir)/$(GD_TREE)
+GD_SRC = $(top_srcdir)/$(GD_TREE)/src
hdr_links = \
$(GD_SRC)/entities.h \
$(GD_SRC)/gd.h \
+ $(GD_SRC)/gd_color_map.h \
+ $(GD_SRC)/gd_errors.h \
$(GD_SRC)/gd_io.h \
$(GD_SRC)/gdcache.h \
$(GD_SRC)/gdfontg.h \
@@ -19,9 +21,7 @@ hdr_links = \
$(GD_SRC)/gdfonts.h \
$(GD_SRC)/gdfontt.h \
$(GD_SRC)/gdfx.h \
- $(GD_SRC)/gdhelpers.h \
- $(GD_SRC)/jisx0208.h \
- $(GD_SRC)/wbmp.h
+ $(GD_SRC)/gdpp.h
include $(top_srcdir)/../am/hdr_links.am
diff --git a/Build/source/libs/gd/include/Makefile.in b/Build/source/libs/gd/include/Makefile.in
index 0d1ca4a7cd6..21fd205bc0c 100644
--- a/Build/source/libs/gd/include/Makefile.in
+++ b/Build/source/libs/gd/include/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,23 +14,51 @@
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
esac; \
- test $$am__dry = yes; \
- }
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -57,12 +85,13 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
+ $(top_srcdir)/../../m4/kpse-win32.m4 \
$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
$(top_srcdir)/../../m4/libtool.m4 \
$(top_srcdir)/../../m4/ltoptions.m4 \
$(top_srcdir)/../../m4/ltsugar.m4 \
$(top_srcdir)/../../m4/ltversion.m4 \
- $(top_srcdir)/../../m4/lt~obsolete.m4 \
+ $(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -219,10 +248,12 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-GD_SRC = $(top_srcdir)/$(GD_TREE)
+GD_SRC = $(top_srcdir)/$(GD_TREE)/src
hdr_links = \
$(GD_SRC)/entities.h \
$(GD_SRC)/gd.h \
+ $(GD_SRC)/gd_color_map.h \
+ $(GD_SRC)/gd_errors.h \
$(GD_SRC)/gd_io.h \
$(GD_SRC)/gdcache.h \
$(GD_SRC)/gdfontg.h \
@@ -231,9 +262,7 @@ hdr_links = \
$(GD_SRC)/gdfonts.h \
$(GD_SRC)/gdfontt.h \
$(GD_SRC)/gdfx.h \
- $(GD_SRC)/gdhelpers.h \
- $(GD_SRC)/jisx0208.h \
- $(GD_SRC)/wbmp.h
+ $(GD_SRC)/gdpp.h
all: all-am