diff options
Diffstat (limited to 'Build')
36 files changed, 174 insertions, 66 deletions
diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog index b7262222673..ce9e2d40fc6 100644 --- a/Build/source/ChangeLog +++ b/Build/source/ChangeLog @@ -1,3 +1,7 @@ +2012-11-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * tardate.ac: Switch to 2012-11-16. + 2012-10-24 Peter Breitenlohner <peb@mppmu.mpg.de> * tardate.ac: Switch to 2012-10-24. diff --git a/Build/source/configure b/Build/source/configure index 19ac957873d..ec0695aaa2d 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for TeX Live 2012-10-24. +# Generated by GNU Autoconf 2.69 for TeX Live 2012-11-16. # # Report bugs to <tex-k@tug.org>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='TeX Live' PACKAGE_TARNAME='tex-live' -PACKAGE_VERSION='2012-10-24' -PACKAGE_STRING='TeX Live 2012-10-24' +PACKAGE_VERSION='2012-11-16' +PACKAGE_STRING='TeX Live 2012-11-16' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -1490,7 +1490,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures TeX Live 2012-10-24 to adapt to many kinds of systems. +\`configure' configures TeX Live 2012-11-16 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1564,7 +1564,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of TeX Live 2012-10-24:";; + short | recursive ) echo "Configuration of TeX Live 2012-11-16:";; esac cat <<\_ACEOF @@ -1864,7 +1864,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -TeX Live configure 2012-10-24 +TeX Live configure 2012-11-16 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2595,7 +2595,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by TeX Live $as_me 2012-10-24, which was +It was created by TeX Live $as_me 2012-11-16, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -10127,7 +10127,7 @@ fi # Define the identity of the package. PACKAGE='tex-live' - VERSION='2012-10-24' + VERSION='2012-11-16' cat >>confdefs.h <<_ACEOF @@ -21404,7 +21404,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by TeX Live $as_me 2012-10-24, which was +This file was extended by TeX Live $as_me 2012-11-16, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21461,7 +21461,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -TeX Live config.status 2012-10-24 +TeX Live config.status 2012-11-16 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/Build/source/libs/freetype/Makefile.am b/Build/source/libs/freetype/Makefile.am index dc2ba91601e..b7e41ed0de3 100644 --- a/Build/source/libs/freetype/Makefile.am +++ b/Build/source/libs/freetype/Makefile.am @@ -1,4 +1,4 @@ -## Proxy Makefile.am to build FreeType for TeX Live. +## Wrapper Makefile.am to build FreeType for TeX Live. ## ## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> ## diff --git a/Build/source/libs/freetype2/Makefile.am b/Build/source/libs/freetype2/Makefile.am index 1fcd7b92a2b..5fb9ba4cad8 100644 --- a/Build/source/libs/freetype2/Makefile.am +++ b/Build/source/libs/freetype2/Makefile.am @@ -1,4 +1,4 @@ -## Proxy Makefile.am to build FreeType for TeX Live. +## Wrapper Makefile.am to build FreeType for TeX Live. ## ## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> ## diff --git a/Build/source/libs/gd/ChangeLog b/Build/source/libs/gd/ChangeLog index 7a55aeaa5ce..192f7533b02 100644 --- a/Build/source/libs/gd/ChangeLog +++ b/Build/source/libs/gd/ChangeLog @@ -1,3 +1,7 @@ +2012-11-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Avoid use of deprecated INCLUDES. + 2012-02-24 Peter Breitenlohner <peb@mppmu.mpg.de> * include/Makefile.am: Use ../am/hdr_links.am. diff --git a/Build/source/libs/gd/Makefile.am b/Build/source/libs/gd/Makefile.am index 4b0c419dca8..2cfc5e4bc81 100644 --- a/Build/source/libs/gd/Makefile.am +++ b/Build/source/libs/gd/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to build libpng for TeX Live. ## -## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -41,9 +41,8 @@ dist-hook: SUBDIRS = include -INCLUDES = -I$(top_srcdir)/$(GD_TREE) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(FREETYPE2_INCLUDES) - -AM_CPPFLAGS = -DNONDLL +AM_CPPFLAGS = -I$(top_srcdir)/$(GD_TREE) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(FREETYPE2_INCLUDES) +AM_CPPFLAGS += -DNONDLL noinst_LIBRARIES=libgd.a diff --git a/Build/source/libs/gd/Makefile.in b/Build/source/libs/gd/Makefile.in index 8c70adb3f4e..bd463069b58 100644 --- a/Build/source/libs/gd/Makefile.in +++ b/Build/source/libs/gd/Makefile.in @@ -304,8 +304,8 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 EXTRA_DIST = $(GD_TREE) $(GD_TREE)-PATCHES SUBDIRS = include -INCLUDES = -I$(top_srcdir)/$(GD_TREE) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(FREETYPE2_INCLUDES) -AM_CPPFLAGS = -DNONDLL +AM_CPPFLAGS = -I$(top_srcdir)/$(GD_TREE) $(ZLIB_INCLUDES) \ + $(LIBPNG_INCLUDES) $(FREETYPE2_INCLUDES) -DNONDLL noinst_LIBRARIES = libgd.a nodist_libgd_a_SOURCES = \ $(GD_TREE)/gd.c \ diff --git a/Build/source/libs/graphite/ChangeLog b/Build/source/libs/graphite/ChangeLog index 7c9c24a9ea9..d22ed96e2a3 100644 --- a/Build/source/libs/graphite/ChangeLog +++ b/Build/source/libs/graphite/ChangeLog @@ -1,3 +1,7 @@ +2012-11-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Avoid use of deprecated INCLUDES. + 2012-03-16 Peter Breitenlohner <peb@mppmu.mpg.de> Import engine-2.4 diff --git a/Build/source/libs/graphite/Makefile.am b/Build/source/libs/graphite/Makefile.am index 385c1c0d0bd..8f711de11b0 100644 --- a/Build/source/libs/graphite/Makefile.am +++ b/Build/source/libs/graphite/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory libs/graphite/ ## -## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -26,9 +26,9 @@ dist-hook: SUBDIRS = include/graphite -INCLUDES = -I$(top_srcdir)/$(GRAPHITE_TREE)/include/graphite -I$(top_srcdir)/$(GRAPHITE_TREE)/src/generic -INCLUDES += -I$(top_srcdir)/$(GRAPHITE_TREE)/src/font -I$(top_srcdir)/$(GRAPHITE_TREE)/src/segment -AM_CPPFLAGS = -DNDEBUG +AM_CPPFLAGS = -I$(top_srcdir)/$(GRAPHITE_TREE)/include/graphite -I$(top_srcdir)/$(GRAPHITE_TREE)/src/generic +AM_CPPFLAGS += -I$(top_srcdir)/$(GRAPHITE_TREE)/src/font -I$(top_srcdir)/$(GRAPHITE_TREE)/src/segment +AM_CPPFLAGS += -DNDEBUG AM_CFLAGS = $(WARNING_CFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) diff --git a/Build/source/libs/graphite/Makefile.in b/Build/source/libs/graphite/Makefile.in index 3ff716fc933..80a82a7de2e 100644 --- a/Build/source/libs/graphite/Makefile.in +++ b/Build/source/libs/graphite/Makefile.in @@ -270,11 +270,10 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 EXTRA_DIST = $(GRAPHITE_TREE) $(GRAPHITE_TREE)-PATCHES SUBDIRS = include/graphite -INCLUDES = -I$(top_srcdir)/$(GRAPHITE_TREE)/include/graphite \ +AM_CPPFLAGS = -I$(top_srcdir)/$(GRAPHITE_TREE)/include/graphite \ -I$(top_srcdir)/$(GRAPHITE_TREE)/src/generic \ -I$(top_srcdir)/$(GRAPHITE_TREE)/src/font \ - -I$(top_srcdir)/$(GRAPHITE_TREE)/src/segment -AM_CPPFLAGS = -DNDEBUG + -I$(top_srcdir)/$(GRAPHITE_TREE)/src/segment -DNDEBUG AM_CFLAGS = $(WARNING_CFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) noinst_LIBRARIES = libgraphite.a diff --git a/Build/source/libs/icu/Makefile.am b/Build/source/libs/icu/Makefile.am index 8c62081cec2..987af97a21b 100644 --- a/Build/source/libs/icu/Makefile.am +++ b/Build/source/libs/icu/Makefile.am @@ -1,6 +1,6 @@ -## Proxy Makefile.am to build ICU for TeX Live. +## Wrapper Makefile.am to build ICU for TeX Live. ## -## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, diff --git a/Build/source/libs/icu/icu-50.1-PATCHES/ChangeLog b/Build/source/libs/icu/icu-50.1-PATCHES/ChangeLog index 81466d67ca9..3c54ab7d70c 100644 --- a/Build/source/libs/icu/icu-50.1-PATCHES/ChangeLog +++ b/Build/source/libs/icu/icu-50.1-PATCHES/ChangeLog @@ -1,3 +1,8 @@ +2012-11-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-84-c++11-bugfix (new): Required for gcc-4.7. + From http://bugs.icu-project.org/trac/ticket/9728. + 2012-11-06 Peter Breitenlohner <peb@mppmu.mpg.de> Updated icu-50.1 source tree (icu4c-50_1-src.tgz) from: diff --git a/Build/source/libs/icu/icu-50.1-PATCHES/patch-84-c++11-bugfix b/Build/source/libs/icu/icu-50.1-PATCHES/patch-84-c++11-bugfix new file mode 100644 index 00000000000..799337f535b --- /dev/null +++ b/Build/source/libs/icu/icu-50.1-PATCHES/patch-84-c++11-bugfix @@ -0,0 +1,74 @@ +diff -ur icu-50.1.orig/source/common/unicode/platform.h icu-50.1/source/common/unicode/platform.h +--- icu-50.1.orig/source/common/unicode/platform.h 2012-11-05 18:14:34.000000000 +0100 ++++ icu-50.1/source/common/unicode/platform.h 2012-11-16 11:24:12.000000000 +0100 +@@ -664,9 +664,9 @@ + * does not support u"abc" string literals. + * gcc 4.4 defines the __CHAR16_TYPE__ macro to a usable type but + * does not support u"abc" string literals. +- * C++11 requires support for UTF-16 literals ++ * C++11 and C11 require support for UTF-16 literals + */ +-# if (defined(__cplusplus) && __cplusplus >= 201103L) ++# if (defined(__cplusplus) && __cplusplus >= 201103L) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) + # define U_HAVE_CHAR16_T 1 + # else + # define U_HAVE_CHAR16_T 0 +diff -ur icu-50.1.orig/source/common/unicode/umachine.h icu-50.1/source/common/unicode/umachine.h +--- icu-50.1.orig/source/common/unicode/umachine.h 2012-11-05 18:14:34.000000000 +0100 ++++ icu-50.1/source/common/unicode/umachine.h 2012-11-16 11:24:12.000000000 +0100 +@@ -256,7 +256,7 @@ + + /** + * \var UChar +- * Define UChar to be char16_t, if available, ++ * Define UChar to be UCHAR_TYPE, if that is #defined (for example, to char16_t), + * or wchar_t if that is 16 bits wide; always assumed to be unsigned. + * If neither is available, then define UChar to be uint16_t. + * +@@ -266,10 +266,10 @@ + * + * @stable ICU 4.4 + */ +- +-/* Define UChar to be compatible with char16_t or wchar_t if possible. */ +-#if U_HAVE_CHAR16_T +- typedef char16_t UChar; ++#if defined(UCHAR_TYPE) ++ typedef UCHAR_TYPE UChar; ++/* Not #elif U_HAVE_CHAR16_T -- because that is type-incompatible with pre-C++11 callers ++ typedef char16_t UChar; */ + #elif U_SIZEOF_WCHAR_T==2 + typedef wchar_t UChar; + #elif defined(__CHAR16_TYPE__) +diff -ur icu-50.1.orig/source/common/unicode/ustring.h icu-50.1/source/common/unicode/ustring.h +--- icu-50.1.orig/source/common/unicode/ustring.h 2012-11-05 18:14:34.000000000 +0100 ++++ icu-50.1/source/common/unicode/ustring.h 2012-11-16 11:24:12.000000000 +0100 +@@ -939,7 +939,7 @@ + * @stable ICU 2.0 + */ + #if defined(U_DECLARE_UTF16) +-# define U_STRING_DECL(var, cs, length) static const UChar var[(length)+1]=U_DECLARE_UTF16(cs) ++# define U_STRING_DECL(var, cs, length) static const UChar *var=(const UChar *)U_DECLARE_UTF16(cs) + /**@stable ICU 2.0 */ + # define U_STRING_INIT(var, cs, length) + #elif U_SIZEOF_WCHAR_T==U_SIZEOF_UCHAR && (U_CHARSET_FAMILY==U_ASCII_FAMILY || (U_SIZEOF_UCHAR == 2 && defined(U_WCHAR_IS_UTF16))) +diff -ur icu-50.1.orig/source/test/intltest/strtest.cpp icu-50.1/source/test/intltest/strtest.cpp +--- icu-50.1.orig/source/test/intltest/strtest.cpp 2012-11-05 18:13:46.000000000 +0100 ++++ icu-50.1/source/test/intltest/strtest.cpp 2012-11-16 11:24:12.000000000 +0100 +@@ -1,6 +1,6 @@ + /******************************************************************** + * COPYRIGHT: +- * Copyright (c) 1997-2011, International Business Machines Corporation and ++ * Copyright (c) 1997-2012, International Business Machines Corporation and + * others. All Rights Reserved. + ********************************************************************/ + /* file name: strtest.cpp +@@ -94,7 +94,7 @@ + void + StringTest::Test_U_STRING() { + U_STRING_INIT(ustringVar, "aZ0 -", 5); +- if( sizeof(ustringVar)/sizeof(*ustringVar)!=6 || ++ if( u_strlen(ustringVar)!=5 || + ustringVar[0]!=0x61 || + ustringVar[1]!=0x5a || + ustringVar[2]!=0x30 || diff --git a/Build/source/libs/icu/icu-50.1/common/unicode/platform.h b/Build/source/libs/icu/icu-50.1/common/unicode/platform.h index 94769d63f9a..46b8d5c8fde 100644 --- a/Build/source/libs/icu/icu-50.1/common/unicode/platform.h +++ b/Build/source/libs/icu/icu-50.1/common/unicode/platform.h @@ -664,9 +664,9 @@ * does not support u"abc" string literals. * gcc 4.4 defines the __CHAR16_TYPE__ macro to a usable type but * does not support u"abc" string literals. - * C++11 requires support for UTF-16 literals + * C++11 and C11 require support for UTF-16 literals */ -# if (defined(__cplusplus) && __cplusplus >= 201103L) +# if (defined(__cplusplus) && __cplusplus >= 201103L) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) # define U_HAVE_CHAR16_T 1 # else # define U_HAVE_CHAR16_T 0 diff --git a/Build/source/libs/icu/icu-50.1/common/unicode/umachine.h b/Build/source/libs/icu/icu-50.1/common/unicode/umachine.h index 6dd6a8e5889..d1102f49365 100644 --- a/Build/source/libs/icu/icu-50.1/common/unicode/umachine.h +++ b/Build/source/libs/icu/icu-50.1/common/unicode/umachine.h @@ -256,7 +256,7 @@ typedef int8_t UBool; /** * \var UChar - * Define UChar to be char16_t, if available, + * Define UChar to be UCHAR_TYPE, if that is #defined (for example, to char16_t), * or wchar_t if that is 16 bits wide; always assumed to be unsigned. * If neither is available, then define UChar to be uint16_t. * @@ -266,10 +266,10 @@ typedef int8_t UBool; * * @stable ICU 4.4 */ - -/* Define UChar to be compatible with char16_t or wchar_t if possible. */ -#if U_HAVE_CHAR16_T - typedef char16_t UChar; +#if defined(UCHAR_TYPE) + typedef UCHAR_TYPE UChar; +/* Not #elif U_HAVE_CHAR16_T -- because that is type-incompatible with pre-C++11 callers + typedef char16_t UChar; */ #elif U_SIZEOF_WCHAR_T==2 typedef wchar_t UChar; #elif defined(__CHAR16_TYPE__) diff --git a/Build/source/libs/icu/icu-50.1/common/unicode/ustring.h b/Build/source/libs/icu/icu-50.1/common/unicode/ustring.h index c5774315858..d2ea31c6747 100644 --- a/Build/source/libs/icu/icu-50.1/common/unicode/ustring.h +++ b/Build/source/libs/icu/icu-50.1/common/unicode/ustring.h @@ -939,7 +939,7 @@ u_memrchr32(const UChar *s, UChar32 c, int32_t count); * @stable ICU 2.0 */ #if defined(U_DECLARE_UTF16) -# define U_STRING_DECL(var, cs, length) static const UChar var[(length)+1]=U_DECLARE_UTF16(cs) +# define U_STRING_DECL(var, cs, length) static const UChar *var=(const UChar *)U_DECLARE_UTF16(cs) /**@stable ICU 2.0 */ # define U_STRING_INIT(var, cs, length) #elif U_SIZEOF_WCHAR_T==U_SIZEOF_UCHAR && (U_CHARSET_FAMILY==U_ASCII_FAMILY || (U_SIZEOF_UCHAR == 2 && defined(U_WCHAR_IS_UTF16))) diff --git a/Build/source/libs/icu/icu-50.1/test/intltest/strtest.cpp b/Build/source/libs/icu/icu-50.1/test/intltest/strtest.cpp index 1f7c81d4ae5..2081454d5fe 100644 --- a/Build/source/libs/icu/icu-50.1/test/intltest/strtest.cpp +++ b/Build/source/libs/icu/icu-50.1/test/intltest/strtest.cpp @@ -1,6 +1,6 @@ /******************************************************************** * COPYRIGHT: - * Copyright (c) 1997-2011, International Business Machines Corporation and + * Copyright (c) 1997-2012, International Business Machines Corporation and * others. All Rights Reserved. ********************************************************************/ /* file name: strtest.cpp @@ -94,7 +94,7 @@ U_STRING_DECL(ustringVar, "aZ0 -", 5); void StringTest::Test_U_STRING() { U_STRING_INIT(ustringVar, "aZ0 -", 5); - if( sizeof(ustringVar)/sizeof(*ustringVar)!=6 || + if( u_strlen(ustringVar)!=5 || ustringVar[0]!=0x61 || ustringVar[1]!=0x5a || ustringVar[2]!=0x30 || diff --git a/Build/source/libs/libpng/ChangeLog b/Build/source/libs/libpng/ChangeLog index 046ec980b1a..30c7a2c5cdf 100644 --- a/Build/source/libs/libpng/ChangeLog +++ b/Build/source/libs/libpng/ChangeLog @@ -1,3 +1,7 @@ +2012-11-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Avoid use of deprecated INCLUDES. + 2012-09-28 Peter Breitenlohner <peb@mppmu.mpg.de> Import libpng-1.5.13. diff --git a/Build/source/libs/libpng/Makefile.am b/Build/source/libs/libpng/Makefile.am index 4bd3685d5cb..b82faa95fa1 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-2011 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -36,8 +36,7 @@ dist-hook: SUBDIRS = include -INCLUDES = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES) -AM_CPPFLAGS = $(LIBPNG_DEFINES) +AM_CPPFLAGS = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES) $(LIBPNG_DEFINES) AM_CFLAGS = $(WARNING_CFLAGS) noinst_LIBRARIES=libpng.a diff --git a/Build/source/libs/libpng/Makefile.in b/Build/source/libs/libpng/Makefile.in index d11adcf08e3..a3864843daa 100644 --- a/Build/source/libs/libpng/Makefile.in +++ b/Build/source/libs/libpng/Makefile.in @@ -266,8 +266,7 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 EXTRA_DIST = $(LIBPNG_TREE) $(LIBPNG_TREE)-PATCHES SUBDIRS = include -INCLUDES = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES) -AM_CPPFLAGS = $(LIBPNG_DEFINES) +AM_CPPFLAGS = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES) $(LIBPNG_DEFINES) AM_CFLAGS = $(WARNING_CFLAGS) noinst_LIBRARIES = libpng.a nodist_libpng_a_SOURCES = \ diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog index bd42ca1f59d..edac98738a0 100644 --- a/Build/source/libs/poppler/ChangeLog +++ b/Build/source/libs/poppler/ChangeLog @@ -1,3 +1,7 @@ +2012-11-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Avoid use of deprecated INCLUDES. + 2012-10-15 Peter Breitenlohner <peb@mppmu.mpg.de> Import poppler-0.21.0. diff --git a/Build/source/libs/poppler/Makefile.am b/Build/source/libs/poppler/Makefile.am index 51bc686c3b4..9053425f09b 100644 --- a/Build/source/libs/poppler/Makefile.am +++ b/Build/source/libs/poppler/Makefile.am @@ -30,8 +30,8 @@ GOO_SRC = $(top_srcdir)/$(POPPLER_TREE)/goo FOFI_SRC = $(top_srcdir)/$(POPPLER_TREE)/fofi POPPLER_SRC = $(top_srcdir)/$(POPPLER_TREE)/poppler -INCLUDES = -Igoo -Ifofi -Ipoppler -I$(GOO_SRC) -I$(FOFI_SRC) -I$(POPPLER_SRC) $(ZLIB_INCLUDES) -AM_CPPFLAGS = -DPOPPLER_DATADIR='"."' +AM_CPPFLAGS = -Igoo -Ifofi -Ipoppler -I$(GOO_SRC) -I$(FOFI_SRC) -I$(POPPLER_SRC) $(ZLIB_INCLUDES) +AM_CPPFLAGS += -DPOPPLER_DATADIR='"."' AM_CFLAGS = $(WARNING_CFLAGS) AM_CXXFLAGS = $(NO_WARN_CXXFLAGS) diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in index 67036341a35..f1daf354bed 100644 --- a/Build/source/libs/poppler/Makefile.in +++ b/Build/source/libs/poppler/Makefile.in @@ -289,8 +289,8 @@ SUBDIRS = goo fofi poppler GOO_SRC = $(top_srcdir)/$(POPPLER_TREE)/goo FOFI_SRC = $(top_srcdir)/$(POPPLER_TREE)/fofi POPPLER_SRC = $(top_srcdir)/$(POPPLER_TREE)/poppler -INCLUDES = -Igoo -Ifofi -Ipoppler -I$(GOO_SRC) -I$(FOFI_SRC) -I$(POPPLER_SRC) $(ZLIB_INCLUDES) -AM_CPPFLAGS = -DPOPPLER_DATADIR='"."' +AM_CPPFLAGS = -Igoo -Ifofi -Ipoppler -I$(GOO_SRC) -I$(FOFI_SRC) \ + -I$(POPPLER_SRC) $(ZLIB_INCLUDES) -DPOPPLER_DATADIR='"."' AM_CFLAGS = $(WARNING_CFLAGS) AM_CXXFLAGS = $(NO_WARN_CXXFLAGS) noinst_LIBRARIES = libpoppler.a diff --git a/Build/source/libs/t1lib/ChangeLog b/Build/source/libs/t1lib/ChangeLog index de655217641..77dd1dd0b0a 100644 --- a/Build/source/libs/t1lib/ChangeLog +++ b/Build/source/libs/t1lib/ChangeLog @@ -1,3 +1,7 @@ +2012-11-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Avoid use of deprecated INCLUDES. + 2011-07-19 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac: Use KPSE_COMPILER_WARNINGS. diff --git a/Build/source/libs/t1lib/Makefile.am b/Build/source/libs/t1lib/Makefile.am index 4da83c2894b..41db057ea67 100644 --- a/Build/source/libs/t1lib/Makefile.am +++ b/Build/source/libs/t1lib/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to build t1lib for TeX Live. ## -## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -33,8 +33,7 @@ dist-hook: $(distdir)/$(T1LIB_TREE)/ac-tools/mkinstalldirs \ $(distdir)/$(T1LIB_TREE)/lib/t1lib/t1lib.h -INCLUDES = -Ilib -I$(top_srcdir)/$(T1LIB_TREE) -AM_CPPFLAGS = $(T1LIB_DEFINES) +AM_CPPFLAGS = -Ilib -I$(top_srcdir)/$(T1LIB_TREE) $(T1LIB_DEFINES) AM_CPPFLAGS += -DT1LIB_IDENT=\"@T1LIB_VERSIONSTRING@\" AM_CPPFLAGS += -DGLOBAL_CONFIG_DIR=\"@T1LIB_DATA_DIR@\" diff --git a/Build/source/libs/t1lib/Makefile.in b/Build/source/libs/t1lib/Makefile.in index 51a41a1e888..5ae733b0ba0 100644 --- a/Build/source/libs/t1lib/Makefile.in +++ b/Build/source/libs/t1lib/Makefile.in @@ -237,8 +237,8 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 EXTRA_DIST = $(T1LIB_TREE) $(T1LIB_TREE)-PATCHES l047016t.pfa \ l047016t.xafm -INCLUDES = -Ilib -I$(top_srcdir)/$(T1LIB_TREE) -AM_CPPFLAGS = $(T1LIB_DEFINES) -DT1LIB_IDENT=\"@T1LIB_VERSIONSTRING@\" \ +AM_CPPFLAGS = -Ilib -I$(top_srcdir)/$(T1LIB_TREE) $(T1LIB_DEFINES) \ + -DT1LIB_IDENT=\"@T1LIB_VERSIONSTRING@\" \ -DGLOBAL_CONFIG_DIR=\"@T1LIB_DATA_DIR@\" AM_CFLAGS = $(T1LIB_CFLAGS) # $(WARNING_CFLAGS) LDADD = libt1.a diff --git a/Build/source/libs/teckit/ChangeLog b/Build/source/libs/teckit/ChangeLog index f82d8ef9b41..6cc7731fdd1 100644 --- a/Build/source/libs/teckit/ChangeLog +++ b/Build/source/libs/teckit/ChangeLog @@ -1,3 +1,7 @@ +2012-11-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Avoid use of deprecated INCLUDES. + 2012-03-17 Peter Breitenlohner <peb@mppmu.mpg.de> Import TECkit-2.5.3 diff --git a/Build/source/libs/teckit/Makefile.am b/Build/source/libs/teckit/Makefile.am index 38828e11f65..36b750df6ac 100644 --- a/Build/source/libs/teckit/Makefile.am +++ b/Build/source/libs/teckit/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory libs/teckit/ ## -## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -26,8 +26,8 @@ dist-hook: SUBDIRS = include/teckit -INCLUDES = -I$(top_srcdir)/$(TECKIT_TREE)/source/Public-headers $(ZLIB_INCLUDES) -AM_CPPFLAGS = -DNDEBUG +AM_CPPFLAGS = -I$(top_srcdir)/$(TECKIT_TREE)/source/Public-headers $(ZLIB_INCLUDES) +AM_CPPFLAGS += -DNDEBUG AM_CFLAGS = $(WARNING_CFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) diff --git a/Build/source/libs/teckit/Makefile.in b/Build/source/libs/teckit/Makefile.in index 0706c3bc5af..2c6523a469f 100644 --- a/Build/source/libs/teckit/Makefile.in +++ b/Build/source/libs/teckit/Makefile.in @@ -289,8 +289,8 @@ ACLOCAL_AMFLAGS = -I ../../m4 EXTRA_DIST = $(TECKIT_TREE) $(TECKIT_TREE)-PATCHES teckit.test \ tex-text.map tex-text.tec SUBDIRS = include/teckit -INCLUDES = -I$(top_srcdir)/$(TECKIT_TREE)/source/Public-headers $(ZLIB_INCLUDES) -AM_CPPFLAGS = -DNDEBUG +AM_CPPFLAGS = -I$(top_srcdir)/$(TECKIT_TREE)/source/Public-headers \ + $(ZLIB_INCLUDES) -DNDEBUG AM_CFLAGS = $(WARNING_CFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) noinst_LIBRARIES = libTECkit_Compiler.a libTECkit.a diff --git a/Build/source/libs/zlib/ChangeLog b/Build/source/libs/zlib/ChangeLog index 4f5af92c3cd..5f7071001ea 100644 --- a/Build/source/libs/zlib/ChangeLog +++ b/Build/source/libs/zlib/ChangeLog @@ -1,3 +1,7 @@ +2012-11-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Avoid use of deprecated INCLUDES. + 2012-05-03 Peter Breitenlohner <peb@mppmu.mpg.de> Import zlib-1.2.7. diff --git a/Build/source/libs/zlib/Makefile.am b/Build/source/libs/zlib/Makefile.am index 756b285fa0c..0584444885a 100644 --- a/Build/source/libs/zlib/Makefile.am +++ b/Build/source/libs/zlib/Makefile.am @@ -30,8 +30,7 @@ dist-hook: SUBDIRS = . include -INCLUDES = -I$(top_srcdir)/$(ZLIB_TREE) -AM_CPPFLAGS = $(ZLIB_DEFINES) +AM_CPPFLAGS = -I$(top_srcdir)/$(ZLIB_TREE) $(ZLIB_DEFINES) noinst_LIBRARIES = libz.a diff --git a/Build/source/libs/zlib/Makefile.in b/Build/source/libs/zlib/Makefile.in index 19876ac8e9a..30935eb6921 100644 --- a/Build/source/libs/zlib/Makefile.in +++ b/Build/source/libs/zlib/Makefile.in @@ -264,8 +264,7 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 EXTRA_DIST = $(ZLIB_TREE) $(ZLIB_TREE)-PATCHES SUBDIRS = . include -INCLUDES = -I$(top_srcdir)/$(ZLIB_TREE) -AM_CPPFLAGS = $(ZLIB_DEFINES) +AM_CPPFLAGS = -I$(top_srcdir)/$(ZLIB_TREE) $(ZLIB_DEFINES) noinst_LIBRARIES = libz.a nodist_libz_a_SOURCES = \ $(ZLIB_TREE)/adler32.c \ diff --git a/Build/source/libs/zziplib/ChangeLog b/Build/source/libs/zziplib/ChangeLog index a29f3ed653e..3a3991d2895 100644 --- a/Build/source/libs/zziplib/ChangeLog +++ b/Build/source/libs/zziplib/ChangeLog @@ -1,3 +1,7 @@ +2012-11-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Avoid use of deprecated INCLUDES. + 2012-03-12 Peter Breitenlohner <peb@mppmu.mpg.de> Import zziplib-0.13.62. diff --git a/Build/source/libs/zziplib/Makefile.am b/Build/source/libs/zziplib/Makefile.am index 6bc182eb000..1ec5cfea3a5 100644 --- a/Build/source/libs/zziplib/Makefile.am +++ b/Build/source/libs/zziplib/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to build zziplib for TeX Live. ## -## Copyright (C) 2010, 2011 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2010-2012 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -33,8 +33,8 @@ dist-hook: SUBDIRS = include/zzip -INCLUDES = -Iinclude -I$(top_srcdir)/$(ZZIPLIB_TREE) $(ZLIB_INCLUDES) -AM_CPPFLAGS = $(ZZIPLIB_DEFINES) +AM_CPPFLAGS = -Iinclude -I$(top_srcdir)/$(ZZIPLIB_TREE) $(ZLIB_INCLUDES) +AM_CPPFLAGS += $(ZZIPLIB_DEFINES) AM_CFLAGS = $(WARNING_CFLAGS) noinst_LIBRARIES=libzzip.a diff --git a/Build/source/libs/zziplib/Makefile.in b/Build/source/libs/zziplib/Makefile.in index 53dcca2d8d2..9395522665b 100644 --- a/Build/source/libs/zziplib/Makefile.in +++ b/Build/source/libs/zziplib/Makefile.in @@ -277,8 +277,8 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 -I m4 EXTRA_DIST = $(ZZIPLIB_TREE) $(ZZIPLIB_TREE)-PATCHES SUBDIRS = include/zzip -INCLUDES = -Iinclude -I$(top_srcdir)/$(ZZIPLIB_TREE) $(ZLIB_INCLUDES) -AM_CPPFLAGS = $(ZZIPLIB_DEFINES) +AM_CPPFLAGS = -Iinclude -I$(top_srcdir)/$(ZZIPLIB_TREE) \ + $(ZLIB_INCLUDES) $(ZZIPLIB_DEFINES) AM_CFLAGS = $(WARNING_CFLAGS) noinst_LIBRARIES = libzzip.a nodist_libzzip_a_SOURCES = \ diff --git a/Build/source/tardate.ac b/Build/source/tardate.ac index f8b3e46295d..82ce1bc09b7 100644 --- a/Build/source/tardate.ac +++ b/Build/source/tardate.ac @@ -8,4 +8,4 @@ dnl dnl -------------------------------------------------------- dnl dnl m4-include this file to define the current TeX Live tarball version -m4_define([tex_live_tardate], [2012-10-24]) +m4_define([tex_live_tardate], [2012-11-16]) |