summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvisvgm
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/dvisvgm')
-rw-r--r--Build/source/texk/dvisvgm/ChangeLog4
-rw-r--r--Build/source/texk/dvisvgm/Makefile.am12
-rw-r--r--Build/source/texk/dvisvgm/Makefile.in12
-rw-r--r--Build/source/texk/dvisvgm/aclocal.m46
4 files changed, 19 insertions, 15 deletions
diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog
index 871fa5c954e..0bf85b05b8e 100644
--- a/Build/source/texk/dvisvgm/ChangeLog
+++ b/Build/source/texk/dvisvgm/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-09-28 Peter Breitenlohner <peb@mppmu.mpg.de>
* Imported release 1.0.12.
diff --git a/Build/source/texk/dvisvgm/Makefile.am b/Build/source/texk/dvisvgm/Makefile.am
index 84fdede2936..31639ed1b42 100644
--- a/Build/source/texk/dvisvgm/Makefile.am
+++ b/Build/source/texk/dvisvgm/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/dvisvgm/
##
-## 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.
##
#************************************************************************
@@ -24,12 +24,12 @@ EXTRA_DIST += $(DVISVGM_TREE)-PATCHES
dist-hook:
rm -rf `find $(distdir) -name .svn`
-INCLUDES = -I$(top_srcdir)/$(DVISVGM_TREE)/src
-INCLUDES += -I$(top_srcdir)/$(DVISVGM_TREE)/potracelib
-INCLUDES += $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES)
-INCLUDES += $(ZLIB_INCLUDES) $(LIBGS_INCLUDES)
+AM_CPPFLAGS = -I$(top_srcdir)/$(DVISVGM_TREE)/src
+AM_CPPFLAGS += -I$(top_srcdir)/$(DVISVGM_TREE)/potracelib
+AM_CPPFLAGS += $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES)
+AM_CPPFLAGS += $(ZLIB_INCLUDES) $(LIBGS_INCLUDES)
if WIN32
-AM_CPPFLAGS = -DTEXLIVEWIN32
+AM_CPPFLAGS += -DTEXLIVEWIN32
endif WIN32
AM_CFLAGS = $(WARNING_CFLAGS)
AM_CXXFLAGS = $(WARNING_CXXFLAGS)
diff --git a/Build/source/texk/dvisvgm/Makefile.in b/Build/source/texk/dvisvgm/Makefile.in
index fa41e66dfb5..768af9b69c1 100644
--- a/Build/source/texk/dvisvgm/Makefile.in
+++ b/Build/source/texk/dvisvgm/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -51,8 +51,9 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+@WIN32_TRUE@am__append_1 = -DTEXLIVEWIN32
bin_PROGRAMS = dvisvgm$(EXEEXT)
-@dlloader_TRUE@am__append_1 = \
+@dlloader_TRUE@am__append_2 = \
@dlloader_TRUE@ $(DVISVGM_TREE)/src/DLLoader.cpp
subdir = .
@@ -358,11 +359,10 @@ top_srcdir = @top_srcdir@
#************************************************************************
ACLOCAL_AMFLAGS = -I ../../m4
EXTRA_DIST = $(DVISVGM_TREE) $(DVISVGM_TREE)-PATCHES
-INCLUDES = -I$(top_srcdir)/$(DVISVGM_TREE)/src \
+AM_CPPFLAGS = -I$(top_srcdir)/$(DVISVGM_TREE)/src \
-I$(top_srcdir)/$(DVISVGM_TREE)/potracelib \
$(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) $(ZLIB_INCLUDES) \
- $(LIBGS_INCLUDES)
-@WIN32_TRUE@AM_CPPFLAGS = -DTEXLIVEWIN32
+ $(LIBGS_INCLUDES) $(am__append_1)
AM_CFLAGS = $(WARNING_CFLAGS)
AM_CXXFLAGS = $(WARNING_CXXFLAGS)
nodist_man_MANS = \
@@ -425,7 +425,7 @@ nodist_libdvisvgm_a_SOURCES = \
$(DVISVGM_TREE)/src/VFReader.cpp \
$(DVISVGM_TREE)/src/XMLDocument.cpp \
$(DVISVGM_TREE)/src/XMLNode.cpp \
- $(DVISVGM_TREE)/src/XMLString.cpp $(am__append_1)
+ $(DVISVGM_TREE)/src/XMLString.cpp $(am__append_2)
nodist_libpotrace_a_SOURCES = \
$(DVISVGM_TREE)/potracelib/curve.c \
$(DVISVGM_TREE)/potracelib/decompose.c \
diff --git a/Build/source/texk/dvisvgm/aclocal.m4 b/Build/source/texk/dvisvgm/aclocal.m4
index 0f38c6f3af0..d699f803263 100644
--- a/Build/source/texk/dvisvgm/aclocal.m4
+++ b/Build/source/texk/dvisvgm/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])