diff options
Diffstat (limited to 'Build/source/utils')
99 files changed, 215 insertions, 815 deletions
diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in index 9933cfc9847..1d91a27fff7 100644 --- a/Build/source/utils/Makefile.in +++ b/Build/source/utils/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. diff --git a/Build/source/utils/aclocal.m4 b/Build/source/utils/aclocal.m4 index f45fa1bb23b..b4de49d7f48 100644 --- a/Build/source/utils/aclocal.m4 +++ b/Build/source/utils/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]))]) diff --git a/Build/source/utils/biber/Makefile.in b/Build/source/utils/biber/Makefile.in index 1bcb336f9fb..9a77a528188 100644 --- a/Build/source/utils/biber/Makefile.in +++ b/Build/source/utils/biber/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. diff --git a/Build/source/utils/biber/aclocal.m4 b/Build/source/utils/biber/aclocal.m4 index b7fd2e761b8..a8954a8ce6d 100644 --- a/Build/source/utils/biber/aclocal.m4 +++ b/Build/source/utils/biber/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]))]) diff --git a/Build/source/utils/m-tx/ChangeLog b/Build/source/utils/m-tx/ChangeLog index c80769c6b70..a7403da577a 100644 --- a/Build/source/utils/m-tx/ChangeLog +++ b/Build/source/utils/m-tx/ChangeLog @@ -1,3 +1,8 @@ +2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Drop m-tx.lua, + now in ../../texk/texlive/linked_scripts/m-tx. + 2012-10-04 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Drop libp2c.a (multiple definitions). diff --git a/Build/source/utils/m-tx/Makefile.am b/Build/source/utils/m-tx/Makefile.am index 4f1f2e466c6..452ef4735a0 100644 --- a/Build/source/utils/m-tx/Makefile.am +++ b/Build/source/utils/m-tx/Makefile.am @@ -54,20 +54,6 @@ prepmx_SOURCES = \ ## We can not use $(MTX_TREE)/libp2c/p2clib.c (multiple definitions). -lua_scripts = m-tx - -scriptsdir = texmf-dist/scripts/m-tx -nodist_bin_SCRIPTS = - -include $(srcdir)/../../texk/am/script_links.am - -texmfdir = $(datarootdir)/$(scriptsdir) -dist_texmf_SCRIPTS = $(lua_scripts:=.lua) - -install-data-hook: install-lua-links - -uninstall-hook: uninstall-links - dist_man1_MANS = m-tx.1 prepmx.1 ## Tests diff --git a/Build/source/utils/m-tx/Makefile.in b/Build/source/utils/m-tx/Makefile.in index 362394ad226..c46c8eb9bfb 100644 --- a/Build/source/utils/m-tx/Makefile.in +++ b/Build/source/utils/m-tx/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. @@ -14,7 +14,6 @@ @SET_MAKE@ - VPATH = @srcdir@ am__make_dryrun = \ { \ @@ -50,8 +49,8 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : bin_PROGRAMS = prepmx$(EXEEXT) +subdir = . DIST_COMMON = $(am__configure_deps) $(dist_man1_MANS) \ - $(dist_texmf_SCRIPTS) $(srcdir)/../../texk/am/script_links.am \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/../../build-aux/depcomp \ $(top_srcdir)/../../build-aux/install-sh \ @@ -60,8 +59,6 @@ DIST_COMMON = $(am__configure_deps) $(dist_man1_MANS) \ ../../build-aux/depcomp ../../build-aux/install-sh \ ../../build-aux/ltmain.sh ../../build-aux/missing \ ../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog -@WIN32_TRUE@@WIN32_WRAP_TRUE@am__append_1 = $(wrappers) -subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \ $(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \ @@ -73,8 +70,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmfdir)" \ - "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" PROGRAMS = $(bin_PROGRAMS) am_prepmx_OBJECTS = analyze.$(OBJEXT) cfuncs.$(OBJEXT) \ control.$(OBJEXT) files.$(OBJEXT) globals.$(OBJEXT) \ @@ -84,6 +80,21 @@ am_prepmx_OBJECTS = analyze.$(OBJEXT) cfuncs.$(OBJEXT) \ utility.$(OBJEXT) prepmx_OBJECTS = $(am_prepmx_OBJECTS) prepmx_LDADD = $(LDADD) +DEFAULT_INCLUDES = -I.@am__isrc@ +depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(prepmx_SOURCES) +DIST_SOURCES = $(prepmx_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -111,22 +122,6 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -SCRIPTS = $(dist_texmf_SCRIPTS) $(nodist_bin_SCRIPTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(prepmx_SOURCES) -DIST_SOURCES = $(prepmx_SOURCES) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac man1dir = $(mandir)/man1 NROFF = nroff MANS = $(dist_man1_MANS) @@ -248,8 +243,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 -EXTRA_DIST = $(MTX_TREE) $(MTX_TREE)-PATCHES ../../build-aux/relpath \ - $(TESTS) tests/mozart.mtx tests/mozart.pmx +EXTRA_DIST = $(MTX_TREE) $(MTX_TREE)-PATCHES $(TESTS) tests/mozart.mtx \ + tests/mozart.pmx AM_CPPFLAGS = -I$(srcdir)/$(MTX_TREE)/libp2c -DNO_DECLARE_MALLOC AM_CFLAGS = #$(WARNING_CFLAGS) prepmx_SOURCES = \ @@ -285,14 +280,6 @@ prepmx_SOURCES = \ $(MTX_TREE)/utility.c \ $(MTX_TREE)/utility.h -lua_scripts = m-tx -scriptsdir = texmf-dist/scripts/m-tx -nodist_bin_SCRIPTS = $(am__append_1) -all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts) -@WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe) -@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe -texmfdir = $(datarootdir)/$(scriptsdir) -dist_texmf_SCRIPTS = $(lua_scripts:=.lua) dist_man1_MANS = m-tx.1 prepmx.1 TESTS = m-tx.test DISTCLEANFILES = mozart* @@ -302,7 +289,7 @@ all: all-am .SUFFIXES: .c .o .obj am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../texk/am/script_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -325,7 +312,6 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/../../texk/am/script_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -378,76 +364,6 @@ clean-binPROGRAMS: prepmx$(EXEEXT): $(prepmx_OBJECTS) $(prepmx_DEPENDENCIES) $(EXTRA_prepmx_DEPENDENCIES) @rm -f prepmx$(EXEEXT) $(LINK) $(prepmx_OBJECTS) $(prepmx_LDADD) $(LIBS) -install-dist_texmfSCRIPTS: $(dist_texmf_SCRIPTS) - @$(NORMAL_INSTALL) - @list='$(dist_texmf_SCRIPTS)'; test -n "$(texmfdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(texmfdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(texmfdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n' \ - -e 'h;s|.*|.|' \ - -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) { files[d] = files[d] " " $$1; \ - if (++n[d] == $(am__install_max)) { \ - print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ - else { print "f", d "/" $$4, $$1 } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(texmfdir)$$dir'"; \ - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(texmfdir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-dist_texmfSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(dist_texmf_SCRIPTS)'; test -n "$(texmfdir)" || exit 0; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 's,.*/,,;$(transform)'`; \ - dir='$(DESTDIR)$(texmfdir)'; $(am__uninstall_files_from_dir) -install-nodist_binSCRIPTS: $(nodist_bin_SCRIPTS) - @$(NORMAL_INSTALL) - @list='$(nodist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n' \ - -e 'h;s|.*|.|' \ - -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) { files[d] = files[d] " " $$1; \ - if (++n[d] == $(am__install_max)) { \ - print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ - else { print "f", d "/" $$4, $$1 } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \ - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-nodist_binSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(nodist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 's,.*/,,;$(transform)'`; \ - dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -1080,9 +996,9 @@ distcleancheck: distclean check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am -all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) +all-am: Makefile $(PROGRAMS) $(MANS) installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1139,14 +1055,13 @@ info: info-am info-am: -install-data-am: install-dist_texmfSCRIPTS install-man - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook +install-data-am: install-man + install-dvi: install-dvi-am install-dvi-am: -install-exec-am: install-binPROGRAMS install-nodist_binSCRIPTS +install-exec-am: install-binPROGRAMS install-html: install-html-am @@ -1187,13 +1102,11 @@ ps: ps-am ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-dist_texmfSCRIPTS \ - uninstall-man uninstall-nodist_binSCRIPTS - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) uninstall-hook +uninstall-am: uninstall-binPROGRAMS uninstall-man + uninstall-man: uninstall-man1 -.MAKE: check-am install-am install-data-am install-strip uninstall-am +.MAKE: check-am install-am install-strip .PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \ clean clean-binPROGRAMS clean-cscope clean-generic cscope \ @@ -1202,63 +1115,20 @@ uninstall-man: uninstall-man1 distclean distclean-compile distclean-generic distclean-tags \ distcleancheck distdir distuninstallcheck dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-data-hook \ - install-dist_texmfSCRIPTS install-dvi install-dvi-am \ + install-data install-data-am install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-man install-man1 \ - install-nodist_binSCRIPTS install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-binPROGRAMS uninstall-dist_texmfSCRIPTS \ - uninstall-hook uninstall-man uninstall-man1 \ - uninstall-nodist_binSCRIPTS + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-man uninstall-man1 # in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn` -.PHONY: install-lua-links install-perl-links install-shell-links install-sh-links \ - install-links uninstall-links -@WIN32_TRUE@@WIN32_WRAP_TRUE@$(wrappers): $(runscript) -@WIN32_TRUE@@WIN32_WRAP_TRUE@ $(LN_S) $(runscript) $@ - -install-lua-links: -@WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) TYPE=lua EXT=lua install-links - -install-perl-links: -@WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) TYPE=perl EXT=pl install-links - -install-shell-links: -@WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) TYPE=shell EXT=sh install-links - -install-sh-links: -@WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) TYPE=sh EXT=sh install-links - -# We support native builds, multiplatform or not, as well as distro builds. -install-links: - @REL=`$(SHELL) $(srcdir)/../../build-aux/relpath '$(DESTDIR)' '$(bindir)' '$(datarootdir)'`; \ - if test -z "$$REL"; then \ - echo 'unable to compute relative path for linked $(TYPE) scripts' >&2; \ - exit 1; \ - fi; \ - cd $(DESTDIR)$(bindir) && \ - for f in $($(TYPE)_scripts); do \ - rm -f $$f; \ - echo "creating link '$$f' -> '$$REL/$(scriptsdir)/$$f.$(EXT)'"; \ - $(LN_S) $$REL/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \ - done - -uninstall-links: -@WIN32_FALSE@ @for f in $(all_scripts) $(sh_scripts); do \ -@WIN32_FALSE@ echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \ -@WIN32_FALSE@ rm -f "$(DESTDIR)$(bindir)/$$f"; \ -@WIN32_FALSE@ done - -install-data-hook: install-lua-links - -uninstall-hook: uninstall-links # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Build/source/utils/m-tx/aclocal.m4 b/Build/source/utils/m-tx/aclocal.m4 index 70c97706594..9dde02f1d6e 100644 --- a/Build/source/utils/m-tx/aclocal.m4 +++ b/Build/source/utils/m-tx/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]))]) diff --git a/Build/source/utils/m-tx/m-tx.lua b/Build/source/utils/m-tx/m-tx.lua deleted file mode 100755 index 3ed578563ed..00000000000 --- a/Build/source/utils/m-tx/m-tx.lua +++ /dev/null @@ -1,174 +0,0 @@ -#!/usr/bin/env texlua - -VERSION = "0.3" - ---[[ - m-tx.lua: processes MusiXTeX files using prepmx and pmxab as pre-processors (and deletes intermediate files) - - (c) Copyright 2011-2012 Bob Tennent rdt@cs.queensu.ca - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General - Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - ---]] - ---[[ - - ChangeLog: - version 0.3 2012-04-09 RDT - Change name to m-tx to avoid clash with another program. - - version 0.2 2011-11-28 RDT - Added -i (retain intermediate files) option - - version 0.1.1 2011-07-18 RDT - - Removed a file check that caused it to fail (only on Windows!) - - version 0.1 2011-07-15 RDT - ---]] - -function usage() - print("Usage: [texlua] m-tx.lua { option | basename[.mtx] } ... ") - print("options: -v version") - print(" -h help") - print(" -l latex (or pdflatex)") - print(" -p pdfetex (or pdflatex)") - print(" -d dvipdfm") - print(" -s stop at dvi") - print(" -t stop at tex/mid") - print(" -m stop at pmx") - print(" -i retain intermediate files") - print(" -f restore default processing") -end - -function whoami () - print("This is m-tx.lua version ".. VERSION .. ".") -end - -whoami() -if #arg == 0 then - usage() - os.exit(0) -end - --- defaults: -prepmx = "prepmx" -pmx = "pmxab" -tex = "etex" -musixflx = "musixflx" -dvi = "dvips" -ps2pdf = "ps2pdf" -intermediate = 1 - -exit_code = 0 -narg = 1 -repeat - this_arg = arg[narg] - if this_arg == "-v" then - os.exit(0) - elseif this_arg == "-h" then - usage() - os.exit(0) - elseif this_arg == "-l" then - if tex == "pdfetex" then - tex = "pdflatex" - else - tex = "latex" - end - elseif this_arg == "-p" then - if tex == "latex" then - tex = "pdflatex" - else - tex = "pdfetex" - end - dvi = ""; ps2pdf = "" - elseif this_arg == "-d" then - dvi = "dvipdfm"; ps2pdf = "" - elseif this_arg == "-s" then - dvi = ""; ps2pdf = "" - elseif this_arg == "-i" then - intermediate = 0 - elseif this_arg == "-f" then - pmx = "pmxab"; tex = "etex"; dvi = "dvips"; ps2pdf = "ps2pdf"; intermediate = 1 - elseif this_arg == "-t" then - tex = ""; dvi = ""; ps2pdf = "" - elseif this_arg == "-m" then - pmx = ""; tex = ""; dvi = ""; ps2pdf = "" - else - filename = this_arg - if filename ~= "" and string.sub(filename, -4, -1) == ".mtx" then - filename = string.sub(filename, 1, -5) - end - print("Processing ".. filename .. ".mtx.") - OK = true - if ( os.execute(prepmx .. " " .. filename ) ~= 0 ) then - OK = false - end - if (OK and pmx ~= "") then - os.execute(pmx .. " " .. filename) -- does pmx return an error code? - pmxaerr = io.open("pmxaerr.dat", "r") - if (not pmxaerr) then - print("No log file.") - OK = false - else - linebuf = pmxaerr:read() - err = tonumber(linebuf) - if (err ~= 0) then - OK = false - end - pmxaerr:close() - end - end - os.remove( filename .. ".mx2" ) - if ( OK ) and - ((tex == "") or os.execute(tex .. " " .. filename) == 0) and - ((tex == "") or os.execute(musixflx .. " " .. filename) == 0) and - ((tex == "") or os.execute(tex .. " " .. filename) == 0) and - ((tex ~= "latex" and tex ~= "pdflatex") - or (os.execute(tex .. " " .. filename) == 0)) and - (dvi == "" or (os.execute(dvi .. " " .. filename) == 0)) and - (ps2pdf == "" or (os.execute(ps2pdf .. " " .. filename .. ".ps") == 0) ) - then - if ps2pdf ~= "" then - print(filename .. ".pdf generated by " .. ps2pdf .. ".") - end - if intermediate == 1 then -- clean-up: - os.remove( "pmxaerr.dat" ) - os.remove( filename .. ".mx1" ) - os.remove( filename .. ".mx2" ) - if pmx ~= "" then - os.remove( filename .. ".pmx" ) - end - if dvi ~= "" then - os.remove( filename .. ".dvi" ) - end - if ps2pdf ~= "" then - os.remove( filename .. ".ps" ) - end - end - else - print("M-Tx/pmx/MusiXTeX processing of " .. filename .. ".mtx fails.\n") - exit_code = 2 - --[[ uncomment for debugging - print("tex = ", tex) - print("dvi = ", dvi) - print("ps2pdf = ", ps2pdf) - --]] - end - end --if this_arg == ... - narg = narg+1 -until narg > #arg -os.exit( exit_code ) diff --git a/Build/source/utils/pmx/ChangeLog b/Build/source/utils/pmx/ChangeLog index 0d6dab82a3a..4bb75ec507f 100644 --- a/Build/source/utils/pmx/ChangeLog +++ b/Build/source/utils/pmx/ChangeLog @@ -1,3 +1,9 @@ +2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am, configure.ac: Avoid use of deprecated INCLUDES. + * Makefile.am: Drop pmx2pdf.lua, + now in ../../texk/texlive/linked_scripts/pmx. + 2012-07-12 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac: Fixed a typo (AM_CPPPFLAGS => AM_CPPFLAGS). diff --git a/Build/source/utils/pmx/Makefile.am b/Build/source/utils/pmx/Makefile.am index fb5a6ef6625..ac77e0e6d0e 100644 --- a/Build/source/utils/pmx/Makefile.am +++ b/Build/source/utils/pmx/Makefile.am @@ -14,7 +14,7 @@ EXTRA_DIST += $(PMX_TREE)-PATCHES dist-hook: rm -rf `find $(distdir) -name .svn` -INCLUDES = -I$(srcdir)/$(PMX_TREE)/libf2c +AM_CPPFLAGS = -I$(srcdir)/$(PMX_TREE)/libf2c $(PMX_DEFINES) AM_CFLAGS = #$(WARNING_CFLAGS) bin_PROGRAMS = pmxab scor2prt @@ -235,20 +235,6 @@ EXTRA_libf2c_a_SOURCES += \ EXTRA_libf2c_a_SOURCES += \ $(PMX_TREE)/libf2c/signbit.c -lua_scripts = pmx2pdf - -scriptsdir = texmf-dist/scripts/pmx -nodist_bin_SCRIPTS = - -include $(srcdir)/../../texk/am/script_links.am - -texmfdir = $(datarootdir)/$(scriptsdir) -dist_texmf_SCRIPTS = $(lua_scripts:=.lua) - -install-data-hook: install-lua-links - -uninstall-hook: uninstall-links - dist_man1_MANS = pmx2pdf.1 pmxab.1 scor2prt.1 ## Tests diff --git a/Build/source/utils/pmx/Makefile.in b/Build/source/utils/pmx/Makefile.in index bb97ad660b4..764cb330586 100644 --- a/Build/source/utils/pmx/Makefile.in +++ b/Build/source/utils/pmx/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. @@ -15,7 +15,6 @@ @SET_MAKE@ - VPATH = @srcdir@ am__make_dryrun = \ { \ @@ -54,8 +53,8 @@ bin_PROGRAMS = pmxab$(EXEEXT) scor2prt$(EXEEXT) @WIN32_TRUE@am__append_1 = \ @WIN32_TRUE@ $(PMX_TREE)/w32getc.c +subdir = . DIST_COMMON = README $(am__configure_deps) $(dist_man1_MANS) \ - $(dist_texmf_SCRIPTS) $(srcdir)/../../texk/am/script_links.am \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/../../build-aux/depcomp \ $(top_srcdir)/../../build-aux/install-sh \ @@ -64,8 +63,6 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man1_MANS) \ ../../build-aux/depcomp ../../build-aux/install-sh \ ../../build-aux/ltmain.sh ../../build-aux/missing \ ../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog -@WIN32_TRUE@@WIN32_WRAP_TRUE@am__append_2 = $(wrappers) -subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \ $(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \ @@ -214,8 +211,7 @@ am_libf2c_a_OBJECTS = abort_.$(OBJEXT) cabs.$(OBJEXT) derf_.$(OBJEXT) \ xwsne.$(OBJEXT) dtime_.$(OBJEXT) etime_.$(OBJEXT) \ $(am__objects_1) libf2c_a_OBJECTS = $(am_libf2c_a_OBJECTS) -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmfdir)" \ - "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" PROGRAMS = $(bin_PROGRAMS) am_pmxab_OBJECTS = pmxab.$(OBJEXT) pmxab_OBJECTS = $(am_pmxab_OBJECTS) @@ -225,6 +221,23 @@ am_scor2prt_OBJECTS = scor2prt.$(OBJEXT) scor2prt_OBJECTS = $(am_scor2prt_OBJECTS) scor2prt_LDADD = $(LDADD) scor2prt_DEPENDENCIES = libf2c.a +DEFAULT_INCLUDES = -I.@am__isrc@ +depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(libf2c_a_SOURCES) $(EXTRA_libf2c_a_SOURCES) \ + $(pmxab_SOURCES) $(scor2prt_SOURCES) +DIST_SOURCES = $(am__libf2c_a_SOURCES_DIST) $(EXTRA_libf2c_a_SOURCES) \ + $(pmxab_SOURCES) $(scor2prt_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -252,24 +265,6 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -SCRIPTS = $(dist_texmf_SCRIPTS) $(nodist_bin_SCRIPTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(libf2c_a_SOURCES) $(EXTRA_libf2c_a_SOURCES) \ - $(pmxab_SOURCES) $(scor2prt_SOURCES) -DIST_SOURCES = $(am__libf2c_a_SOURCES_DIST) $(EXTRA_libf2c_a_SOURCES) \ - $(pmxab_SOURCES) $(scor2prt_SOURCES) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac man1dir = $(mandir)/man1 NROFF = nroff MANS = $(dist_man1_MANS) @@ -300,7 +295,6 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ -AM_CPPFLAGS = @AM_CPPFLAGS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -341,6 +335,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PMX_DEFINES = @PMX_DEFINES@ PMX_TREE = @PMX_TREE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ @@ -391,8 +386,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 -EXTRA_DIST = $(PMX_TREE) $(PMX_TREE)-PATCHES ../../build-aux/relpath -INCLUDES = -I$(srcdir)/$(PMX_TREE)/libf2c +EXTRA_DIST = $(PMX_TREE) $(PMX_TREE)-PATCHES +AM_CPPFLAGS = -I$(srcdir)/$(PMX_TREE)/libf2c $(PMX_DEFINES) AM_CFLAGS = #$(WARNING_CFLAGS) pmxab_SOURCES = $(PMX_TREE)/pmxab.c scor2prt_SOURCES = $(PMX_TREE)/scor2prt.c @@ -483,14 +478,6 @@ EXTRA_libf2c_a_SOURCES = $(PMX_TREE)/libf2c/uninit.c \ $(PMX_TREE)/libf2c/ftell64_.c $(PMX_TREE)/libf2c/pow_qq.c \ $(PMX_TREE)/libf2c/qbitbits.c $(PMX_TREE)/libf2c/qbitshft.c \ $(PMX_TREE)/libf2c/signbit.c -lua_scripts = pmx2pdf -scriptsdir = texmf-dist/scripts/pmx -nodist_bin_SCRIPTS = $(am__append_2) -all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts) -@WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe) -@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe -texmfdir = $(datarootdir)/$(scriptsdir) -dist_texmf_SCRIPTS = $(lua_scripts:=.lua) dist_man1_MANS = pmx2pdf.1 pmxab.1 scor2prt.1 TESTS = $(PMX_TREE)/pmx.test TESTS_ENVIRONMENT = test_src=$(srcdir)/$(PMX_TREE)/tests @@ -501,7 +488,7 @@ all: all-am .SUFFIXES: .c .o .obj am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../texk/am/script_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -524,7 +511,6 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/../../texk/am/script_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -587,76 +573,6 @@ pmxab$(EXEEXT): $(pmxab_OBJECTS) $(pmxab_DEPENDENCIES) $(EXTRA_pmxab_DEPENDENCIE scor2prt$(EXEEXT): $(scor2prt_OBJECTS) $(scor2prt_DEPENDENCIES) $(EXTRA_scor2prt_DEPENDENCIES) @rm -f scor2prt$(EXEEXT) $(LINK) $(scor2prt_OBJECTS) $(scor2prt_LDADD) $(LIBS) -install-dist_texmfSCRIPTS: $(dist_texmf_SCRIPTS) - @$(NORMAL_INSTALL) - @list='$(dist_texmf_SCRIPTS)'; test -n "$(texmfdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(texmfdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(texmfdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n' \ - -e 'h;s|.*|.|' \ - -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) { files[d] = files[d] " " $$1; \ - if (++n[d] == $(am__install_max)) { \ - print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ - else { print "f", d "/" $$4, $$1 } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(texmfdir)$$dir'"; \ - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(texmfdir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-dist_texmfSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(dist_texmf_SCRIPTS)'; test -n "$(texmfdir)" || exit 0; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 's,.*/,,;$(transform)'`; \ - dir='$(DESTDIR)$(texmfdir)'; $(am__uninstall_files_from_dir) -install-nodist_binSCRIPTS: $(nodist_bin_SCRIPTS) - @$(NORMAL_INSTALL) - @list='$(nodist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n' \ - -e 'h;s|.*|.|' \ - -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) { files[d] = files[d] " " $$1; \ - if (++n[d] == $(am__install_max)) { \ - print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ - else { print "f", d "/" $$4, $$1 } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \ - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-nodist_binSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(nodist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 's,.*/,,;$(transform)'`; \ - dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -3479,9 +3395,9 @@ distcleancheck: distclean check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am -all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) +all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(MANS) installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -3539,14 +3455,13 @@ info: info-am info-am: -install-data-am: install-dist_texmfSCRIPTS install-man - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook +install-data-am: install-man + install-dvi: install-dvi-am install-dvi-am: -install-exec-am: install-binPROGRAMS install-nodist_binSCRIPTS +install-exec-am: install-binPROGRAMS install-html: install-html-am @@ -3587,13 +3502,11 @@ ps: ps-am ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-dist_texmfSCRIPTS \ - uninstall-man uninstall-nodist_binSCRIPTS - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) uninstall-hook +uninstall-am: uninstall-binPROGRAMS uninstall-man + uninstall-man: uninstall-man1 -.MAKE: check-am install-am install-data-am install-strip uninstall-am +.MAKE: check-am install-am install-strip .PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \ clean clean-binPROGRAMS clean-cscope clean-generic \ @@ -3603,62 +3516,20 @@ uninstall-man: uninstall-man1 distclean-generic distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ install install-am install-binPROGRAMS install-data \ - install-data-am install-data-hook install-dist_texmfSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-man1 install-nodist_binSCRIPTS install-pdf \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-man1 install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-binPROGRAMS uninstall-dist_texmfSCRIPTS \ - uninstall-hook uninstall-man uninstall-man1 \ - uninstall-nodist_binSCRIPTS + uninstall-am uninstall-binPROGRAMS uninstall-man \ + uninstall-man1 # in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn` -.PHONY: install-lua-links install-perl-links install-shell-links install-sh-links \ - install-links uninstall-links -@WIN32_TRUE@@WIN32_WRAP_TRUE@$(wrappers): $(runscript) -@WIN32_TRUE@@WIN32_WRAP_TRUE@ $(LN_S) $(runscript) $@ - -install-lua-links: -@WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) TYPE=lua EXT=lua install-links - -install-perl-links: -@WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) TYPE=perl EXT=pl install-links - -install-shell-links: -@WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) TYPE=shell EXT=sh install-links - -install-sh-links: -@WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) TYPE=sh EXT=sh install-links - -# We support native builds, multiplatform or not, as well as distro builds. -install-links: - @REL=`$(SHELL) $(srcdir)/../../build-aux/relpath '$(DESTDIR)' '$(bindir)' '$(datarootdir)'`; \ - if test -z "$$REL"; then \ - echo 'unable to compute relative path for linked $(TYPE) scripts' >&2; \ - exit 1; \ - fi; \ - cd $(DESTDIR)$(bindir) && \ - for f in $($(TYPE)_scripts); do \ - rm -f $$f; \ - echo "creating link '$$f' -> '$$REL/$(scriptsdir)/$$f.$(EXT)'"; \ - $(LN_S) $$REL/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \ - done - -uninstall-links: -@WIN32_FALSE@ @for f in $(all_scripts) $(sh_scripts); do \ -@WIN32_FALSE@ echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \ -@WIN32_FALSE@ rm -f "$(DESTDIR)$(bindir)/$$f"; \ -@WIN32_FALSE@ done - -install-data-hook: install-lua-links - -uninstall-hook: uninstall-links # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Build/source/utils/pmx/aclocal.m4 b/Build/source/utils/pmx/aclocal.m4 index 70c97706594..9dde02f1d6e 100644 --- a/Build/source/utils/pmx/aclocal.m4 +++ b/Build/source/utils/pmx/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]))]) diff --git a/Build/source/utils/pmx/configure b/Build/source/utils/pmx/configure index 765efd3e821..5b3be555a6c 100755 --- a/Build/source/utils/pmx/configure +++ b/Build/source/utils/pmx/configure @@ -632,7 +632,7 @@ GREP CPP RANLIB LN_S -AM_CPPFLAGS +PMX_DEFINES WIN32_WRAP_FALSE WIN32_WRAP_TRUE WIN32_FALSE @@ -3844,7 +3844,7 @@ else fi -AM_CPPFLAGS='-DNON_UNIX_STDIO' +PMX_DEFINES='-DNON_UNIX_STDIO' { $as_echo "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5 @@ -3895,9 +3895,9 @@ $as_echo "$kpse_cv_have_win32" >&6; } case $kpse_cv_have_win32 in #( native) : - AM_CPPFLAGS="$AM_CPPFLAGS -DMSDOS" ;; #( + PMX_DEFINES="$PMX_DEFINES -DMSDOS" ;; #( mingw32) : - AM_CPPFLAGS="$AM_CPPFLAGS -DUSE_CLOCK" ;; #( + PMX_DEFINES="$PMX_DEFINES -DUSE_CLOCK" ;; #( *) : ;; esac @@ -4526,7 +4526,7 @@ _ACEOF if test $ac_cv_sizeof_long_long -lt 8; then - AM_CPPFLAGS="$AM_CPPFLAGS -DNO_LONG_LONG" + PMX_DEFINES="$PMX_DEFINES -DNO_LONG_LONG" fi PMX_TREE=pmx-2.6.18 diff --git a/Build/source/utils/pmx/configure.ac b/Build/source/utils/pmx/configure.ac index d1b5d70ce99..2ebccb4c147 100644 --- a/Build/source/utils/pmx/configure.ac +++ b/Build/source/utils/pmx/configure.ac @@ -26,14 +26,14 @@ AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno]) AM_CONDITIONAL([WIN32_WRAP], [test -r $srcdir/../../texk/texlive/w32_wrapper/runscript.exe]) -dnl initial value for AM_CPPFLAGS -AC_SUBST([AM_CPPFLAGS], ['-DNON_UNIX_STDIO']) +dnl initial value for PMX_DEFINES +AC_SUBST([PMX_DEFINES], ['-DNON_UNIX_STDIO']) dnl WIN32 has no <sys/times.h>, native WIN32 is as MSDOS KPSE_CHECK_WIN32 AS_CASE([$kpse_cv_have_win32], - [native], [AM_CPPFLAGS="$AM_CPPFLAGS -DMSDOS"], - [mingw32], [AM_CPPFLAGS="$AM_CPPFLAGS -DUSE_CLOCK"]) + [native], [PMX_DEFINES="$PMX_DEFINES -DMSDOS"], + [mingw32], [PMX_DEFINES="$PMX_DEFINES -DUSE_CLOCK"]) dnl Checks for programs. AC_PROG_INSTALL @@ -45,7 +45,7 @@ AC_SEARCH_LIBS([sqrt], [m]) AC_CHECK_SIZEOF([long long]) if test $ac_cv_sizeof_long_long -lt 8; then - AM_CPPFLAGS="$AM_CPPFLAGS -DNO_LONG_LONG" + PMX_DEFINES="$PMX_DEFINES -DNO_LONG_LONG" fi AC_SUBST([PMX_TREE], [pmx-]pmx_version) diff --git a/Build/source/utils/pmx/pmx2pdf.lua b/Build/source/utils/pmx/pmx2pdf.lua deleted file mode 100755 index 37790841e5f..00000000000 --- a/Build/source/utils/pmx/pmx2pdf.lua +++ /dev/null @@ -1,158 +0,0 @@ -#!/usr/bin/env texlua - -VERSION = "0.2.1" - ---[[ - pmx2pdf: processes MusiXTeX files using pmxab as a pre-processor - (and deletes intermediate files) - - (c) Copyright 2011-12 Bob Tennent rdt@cs.queensu.ca - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General - Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - ---]] - ---[[ - - ChangeLog: - version 0.2.1 2012-05-15 RDT - renamed to avoid possible name clashes - - version 0.2 2011-11-28 RDT - added -i (retain intermediate files) option - - version 0.1 2011-07-12 RDT - ---]] - -function usage() - print("Usage: [texlua] pmx2pdf { option | basename[.pmx] } ... ") - print("options: -v version") - print(" -h help") - print(" -l latex (or pdflatex)") - print(" -p pdfetex (or pdflatex)") - print(" -d dvipdfm") - print(" -s stop at dvi") - print(" -t stop at tex/mid") - print(" -i retain intermediate files") - print(" -f restore default processing") -end - -function whoami () - print("This is pmx2pdf version ".. VERSION .. ".") -end - -whoami() -if #arg == 0 then - usage() - os.exit(0) -end - --- defaults: -tex = "etex" -musixflx = "musixflx" -dvi = "dvips" -ps2pdf = "ps2pdf" -intermediate = 1 - -exit_code = 0 -narg = 1 -repeat - this_arg = arg[narg] - if this_arg == "-v" then - os.exit(0) - elseif this_arg == "-h" then - usage() - os.exit(0) - elseif this_arg == "-l" then - if tex == "pdfetex" then - tex = "pdflatex" - else - tex = "latex" - end - elseif this_arg == "-p" then - if tex == "latex" then - tex = "pdflatex" - else - tex = "pdfetex" - end - dvi = ""; ps2pdf = "" - elseif this_arg == "-d" then - dvi = "dvipdfm"; ps2pdf = "" - elseif this_arg == "-s" then - dvi = ""; ps2pdf = "" - elseif this_arg == "-f" then - tex = "etex"; dvi = "dvips"; ps2pdf = "ps2pdf"; intermediate = 1 - elseif this_arg == "-t" then - tex = ""; dvi = ""; ps2pdf = "" - elseif this_arg == "-i" then - intermediate = 0 - else - filename = this_arg - if filename ~= "" and string.sub(filename, -4, -1) == ".pmx" then - filename = string.sub(filename, 1, -5) - end - if not io.open(filename .. ".pmx", "r") then - print("Non-existent file: ", filename .. ".pmx") - else - print("Processing ".. filename .. ".pmx.") - os.remove( filename .. ".mx2" ) - os.execute("pmxab" .. " " .. filename ) - pmxaerr = io.open("pmxaerr.dat", "r") - if (not pmxaerr) then - print("No log file.") - os.exit(1) - end - linebuf = pmxaerr:read() - err = tonumber(linebuf) - pmxaerr:close() - if ( err == 0 ) and - ((tex == "") or os.execute(tex .. " " .. filename) == 0) and - ((tex == "") or os.execute(musixflx .. " " .. filename) == 0) and - ((tex == "") or os.execute(tex .. " " .. filename) == 0) and - ((tex ~= "latex" and tex ~= "pdflatex") - or (os.execute(tex .. " " .. filename) == 0)) and - (dvi == "" or (os.execute(dvi .. " " .. filename) == 0)) and - (ps2pdf == "" or (os.execute(ps2pdf .. " " .. filename .. ".ps") == 0) ) - then - if ps2pdf ~= "" then - print(filename .. ".pdf generated by " .. ps2pdf .. ".") - end - if intermediate == 1 then -- clean-up: - os.remove( "pmxaerr.dat" ) - os.remove( filename .. ".mx1" ) - os.remove( filename .. ".mx2" ) - if dvi ~= "" then - os.remove( filename .. ".dvi" ) - end - if ps2pdf ~= "" then - os.remove( filename .. ".ps" ) - end - end - else - print("PMX/MusiXTeX processing of " .. filename .. ".pmx fails.\n") - exit_code = 2 - --[[ uncomment for debugging - print("tex = ", tex) - print("dvi = ", dvi) - print("ps2pdf = ", ps2pdf) - --]] - end - - end --if not io.open ... - end --if this_arg == ... - narg = narg+1 -until narg > #arg -os.exit( exit_code ) diff --git a/Build/source/utils/ps2eps/Makefile.in b/Build/source/utils/ps2eps/Makefile.in index 903fb36ae3c..b3c4292cd39 100644 --- a/Build/source/utils/ps2eps/Makefile.in +++ b/Build/source/utils/ps2eps/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. diff --git a/Build/source/utils/ps2eps/aclocal.m4 b/Build/source/utils/ps2eps/aclocal.m4 index 70c97706594..9dde02f1d6e 100644 --- a/Build/source/utils/ps2eps/aclocal.m4 +++ b/Build/source/utils/ps2eps/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]))]) diff --git a/Build/source/utils/psutils/Makefile.in b/Build/source/utils/psutils/Makefile.in index 3157bc36003..e0179614eaa 100644 --- a/Build/source/utils/psutils/Makefile.in +++ b/Build/source/utils/psutils/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. diff --git a/Build/source/utils/psutils/aclocal.m4 b/Build/source/utils/psutils/aclocal.m4 index 70c97706594..9dde02f1d6e 100644 --- a/Build/source/utils/psutils/aclocal.m4 +++ b/Build/source/utils/psutils/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]))]) diff --git a/Build/source/utils/t1utils/ChangeLog b/Build/source/utils/t1utils/ChangeLog index d1f6d7843b8..7a0f8b9b97a 100644 --- a/Build/source/utils/t1utils/ChangeLog +++ b/Build/source/utils/t1utils/ChangeLog @@ -1,3 +1,7 @@ +2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Avoid use of deprecated INCLUDES. + 2011-11-04 Peter Breitenlohner <peb@mppmu.mpg.de> * t1utils.test: Perform all sub-tests and report failed ones. diff --git a/Build/source/utils/t1utils/Makefile.am b/Build/source/utils/t1utils/Makefile.am index 772fef071b5..e8f635567d1 100644 --- a/Build/source/utils/t1utils/Makefile.am +++ b/Build/source/utils/t1utils/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory utils/t1utils/ ## -## Copyright (C) 2008-2011 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2008-2012 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## #************************************************************************ @@ -26,7 +26,7 @@ EXTRA_DIST += $(T1UTILS_TREE)-PATCHES dist-hook: rm -rf `find $(distdir) -name .svn` -INCLUDES = -I$(top_srcdir)/$(T1UTILS_TREE)/include +AM_CPPFLAGS = -I$(top_srcdir)/$(T1UTILS_TREE)/include AM_CFLAGS = $(WARNING_CFLAGS) bin_PROGRAMS = t1ascii t1binary t1asm t1disasm t1unmac t1mac diff --git a/Build/source/utils/t1utils/Makefile.in b/Build/source/utils/t1utils/Makefile.in index 165907ce92e..5c3fa12ceda 100644 --- a/Build/source/utils/t1utils/Makefile.in +++ b/Build/source/utils/t1utils/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. @@ -268,7 +268,7 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 EXTRA_DIST = $(T1UTILS_TREE) $(T1UTILS_TREE)-PATCHES $(TESTS) \ tests/Symbol.pfa tests/Symbol.pfb tests/Symbol.raw -INCLUDES = -I$(top_srcdir)/$(T1UTILS_TREE)/include +AM_CPPFLAGS = -I$(top_srcdir)/$(T1UTILS_TREE)/include AM_CFLAGS = $(WARNING_CFLAGS) dist_man_MANS = \ $(T1UTILS_TREE)/t1ascii.1 \ diff --git a/Build/source/utils/t1utils/aclocal.m4 b/Build/source/utils/t1utils/aclocal.m4 index a7ba883eeed..d9ad5fe21b5 100644 --- a/Build/source/utils/t1utils/aclocal.m4 +++ b/Build/source/utils/t1utils/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]))]) diff --git a/Build/source/utils/tpic2pdftex/Makefile.in b/Build/source/utils/tpic2pdftex/Makefile.in index dcbb40bcc84..85f59866610 100644 --- a/Build/source/utils/tpic2pdftex/Makefile.in +++ b/Build/source/utils/tpic2pdftex/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. diff --git a/Build/source/utils/tpic2pdftex/aclocal.m4 b/Build/source/utils/tpic2pdftex/aclocal.m4 index 4c675ff6952..8062e341e3a 100644 --- a/Build/source/utils/tpic2pdftex/aclocal.m4 +++ b/Build/source/utils/tpic2pdftex/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]))]) diff --git a/Build/source/utils/vlna/Makefile.in b/Build/source/utils/vlna/Makefile.in index 7c5a6842bb5..40192ebda92 100644 --- a/Build/source/utils/vlna/Makefile.in +++ b/Build/source/utils/vlna/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. diff --git a/Build/source/utils/vlna/aclocal.m4 b/Build/source/utils/vlna/aclocal.m4 index a7ba883eeed..d9ad5fe21b5 100644 --- a/Build/source/utils/vlna/aclocal.m4 +++ b/Build/source/utils/vlna/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]))]) diff --git a/Build/source/utils/xindy/Makefile.in b/Build/source/utils/xindy/Makefile.in index 6e6ecdfd46f..2fd995b8d5e 100644 --- a/Build/source/utils/xindy/Makefile.in +++ b/Build/source/utils/xindy/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. diff --git a/Build/source/utils/xindy/aclocal.m4 b/Build/source/utils/xindy/aclocal.m4 index 0fbf0af9d7a..c0234077772 100644 --- a/Build/source/utils/xindy/aclocal.m4 +++ b/Build/source/utils/xindy/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]))]) diff --git a/Build/source/utils/xindy/xindy-2.4/Makefile.in b/Build/source/utils/xindy/xindy-2.4/Makefile.in index 6f64a1538a0..3f308cc7ec2 100644 --- a/Build/source/utils/xindy/xindy-2.4/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/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. diff --git a/Build/source/utils/xindy/xindy-2.4/doc/Makefile.in b/Build/source/utils/xindy/xindy-2.4/doc/Makefile.in index 87a5198160a..bf10b2f85ed 100644 --- a/Build/source/utils/xindy/xindy-2.4/doc/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/doc/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. diff --git a/Build/source/utils/xindy/xindy-2.4/doc/style-tutorial/Makefile.in b/Build/source/utils/xindy/xindy-2.4/doc/style-tutorial/Makefile.in index 8ac768cf325..0e07d8e6300 100644 --- a/Build/source/utils/xindy/xindy-2.4/doc/style-tutorial/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/doc/style-tutorial/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/Makefile.in index e23775e1410..1ada2d83c5a 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/Makefile.in index 43e4d876235..7974bfb4a59 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/albanian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/albanian/Makefile.in index 0c515fbc2d9..3fcd61f142a 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/albanian/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/albanian/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/belarusian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/belarusian/Makefile.in index 3277fda8410..3552b553d8e 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/belarusian/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/belarusian/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/bulgarian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/bulgarian/Makefile.in index 59a2cf229c9..207f525e4ef 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/bulgarian/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/bulgarian/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/croatian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/croatian/Makefile.in index 1cc5e9f5148..87b1c9daf46 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/croatian/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/croatian/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/czech/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/czech/Makefile.in index 4132a6020de..71575a39b29 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/czech/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/czech/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/danish/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/danish/Makefile.in index 95bda30f61a..b95a09facbc 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/danish/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/danish/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/dutch/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/dutch/Makefile.in index ef285da018d..1927cc61b4c 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/dutch/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/dutch/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/english/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/english/Makefile.in index 40e903b6f29..c4ec5da0b60 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/english/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/english/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/esperanto/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/esperanto/Makefile.in index 5ee78daa0a6..5a96cbd2f9b 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/esperanto/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/esperanto/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/estonian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/estonian/Makefile.in index 299ec929a9a..e9a5f29c7fd 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/estonian/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/estonian/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/finnish/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/finnish/Makefile.in index 3b21ddca4b4..d4c2aa3ec3c 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/finnish/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/finnish/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/french/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/french/Makefile.in index a79def93a4e..1cf04ce47ac 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/french/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/french/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/general/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/general/Makefile.in index 02f19de5279..0ca46ee8375 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/general/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/general/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/georgian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/georgian/Makefile.in index 22d34bf4610..851f82ed39f 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/georgian/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/georgian/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/german/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/german/Makefile.in index 192e7a9f1af..6d1119226cb 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/german/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/german/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/greek/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/greek/Makefile.in index 68dd4b40e98..b118fbd8650 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/greek/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/greek/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/gypsy/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/gypsy/Makefile.in index cabb9af4d2e..eed0d2724aa 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/gypsy/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/gypsy/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hausa/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hausa/Makefile.in index 2cab92aa283..3aac1432da7 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hausa/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hausa/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hebrew/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hebrew/Makefile.in index 53ede732d64..1506cc9e742 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hebrew/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hebrew/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hungarian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hungarian/Makefile.in index 46b3e67f7ca..1f4cd6bab83 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hungarian/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hungarian/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/icelandic/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/icelandic/Makefile.in index 6f3a85bb0a9..2ca9a6e3745 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/icelandic/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/icelandic/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/italian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/italian/Makefile.in index 33f019f94b7..7290a693ab1 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/italian/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/italian/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/klingon/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/klingon/Makefile.in index f80882d02ef..ce59372f79e 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/klingon/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/klingon/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/kurdish/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/kurdish/Makefile.in index aac47e80eea..1160c9d3c51 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/kurdish/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/kurdish/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/latin/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/latin/Makefile.in index 8dd9e63066f..cbd98995c30 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/latin/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/latin/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/latvian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/latvian/Makefile.in index ba9584b30ec..50e35e887b2 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/latvian/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/latvian/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/lithuanian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/lithuanian/Makefile.in index f02000d6444..53e13427e4f 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/lithuanian/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/lithuanian/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/lower-sorbian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/lower-sorbian/Makefile.in index df47537eeb5..6891008b9ab 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/lower-sorbian/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/lower-sorbian/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/macedonian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/macedonian/Makefile.in index 2f90ee5498a..6449bb077a0 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/macedonian/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/macedonian/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/mongolian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/mongolian/Makefile.in index 5c9a74f3f6e..68c055e848e 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/mongolian/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/mongolian/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/norwegian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/norwegian/Makefile.in index 2d8f516252a..c90d7bf4722 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/norwegian/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/norwegian/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/persian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/persian/Makefile.in index 7ef8bb18d8d..e33428d04a3 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/persian/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/persian/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/polish/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/polish/Makefile.in index 75f1531f0b5..7cc884e3cc1 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/polish/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/polish/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/portuguese/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/portuguese/Makefile.in index 97d22f92a20..1bf88e73047 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/portuguese/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/portuguese/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/romanian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/romanian/Makefile.in index fdf3fb9431c..e19870c8c32 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/romanian/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/romanian/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/russian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/russian/Makefile.in index 33c6ea54197..e4a6340ba1c 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/russian/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/russian/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/serbian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/serbian/Makefile.in index 70d3985f5ce..ae929cb3758 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/serbian/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/serbian/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/slovak/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/slovak/Makefile.in index 8828ed115a6..47fbfa291cc 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/slovak/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/slovak/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/slovenian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/slovenian/Makefile.in index 1b6639f2341..5a44f46dc0b 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/slovenian/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/slovenian/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/spanish/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/spanish/Makefile.in index b46254e0426..f60c8e098cf 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/spanish/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/spanish/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/swedish/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/swedish/Makefile.in index f580d270eaa..87bbc47a307 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/swedish/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/swedish/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/test1/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/test1/Makefile.in index 4bf778c2ba9..6ce045115f6 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/test1/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/test1/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/turkish/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/turkish/Makefile.in index 0b376fad383..094fc102d61 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/turkish/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/turkish/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/ukrainian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/ukrainian/Makefile.in index 2c631e879f6..3eca7bdba06 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/ukrainian/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/ukrainian/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/upper-sorbian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/upper-sorbian/Makefile.in index e9a1ac832c8..5827f4a826a 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/upper-sorbian/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/upper-sorbian/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/vietnamese/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/vietnamese/Makefile.in index 53d4975c4b6..bd43649a7ea 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/vietnamese/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/vietnamese/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/inputenc/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/inputenc/Makefile.in index 5e74cb01f6d..8b6d0d0b2d3 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/inputenc/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/inputenc/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. diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/styles/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/styles/Makefile.in index 54157f8b2c9..fd28fd9c769 100644 --- a/Build/source/utils/xindy/xindy-2.4/make-rules/styles/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/make-rules/styles/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. diff --git a/Build/source/utils/xindy/xindy-2.4/modules/Makefile.in b/Build/source/utils/xindy/xindy-2.4/modules/Makefile.in index aa7bf255e77..c6c051e9ba0 100644 --- a/Build/source/utils/xindy/xindy-2.4/modules/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/modules/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. diff --git a/Build/source/utils/xindy/xindy-2.4/modules/base/Makefile.in b/Build/source/utils/xindy/xindy-2.4/modules/base/Makefile.in index c719fd25711..2600f6cb6f4 100644 --- a/Build/source/utils/xindy/xindy-2.4/modules/base/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/modules/base/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. diff --git a/Build/source/utils/xindy/xindy-2.4/modules/class/Makefile.in b/Build/source/utils/xindy/xindy-2.4/modules/class/Makefile.in index cac83f46c12..d9512c86011 100644 --- a/Build/source/utils/xindy/xindy-2.4/modules/class/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/modules/class/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. diff --git a/Build/source/utils/xindy/xindy-2.4/modules/lang/Makefile.in b/Build/source/utils/xindy/xindy-2.4/modules/lang/Makefile.in index db7d5146a82..6274cae5d64 100644 --- a/Build/source/utils/xindy/xindy-2.4/modules/lang/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/modules/lang/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. diff --git a/Build/source/utils/xindy/xindy-2.4/modules/lang/german/Makefile.in b/Build/source/utils/xindy/xindy-2.4/modules/lang/german/Makefile.in index 673aba33afa..25668546614 100644 --- a/Build/source/utils/xindy/xindy-2.4/modules/lang/german/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/modules/lang/german/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. diff --git a/Build/source/utils/xindy/xindy-2.4/modules/lang/latin/Makefile.in b/Build/source/utils/xindy/xindy-2.4/modules/lang/latin/Makefile.in index e849d0f73b5..3df92a66dee 100644 --- a/Build/source/utils/xindy/xindy-2.4/modules/lang/latin/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/modules/lang/latin/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. diff --git a/Build/source/utils/xindy/xindy-2.4/modules/ord/Makefile.in b/Build/source/utils/xindy/xindy-2.4/modules/ord/Makefile.in index d27457fae2b..94368883c46 100644 --- a/Build/source/utils/xindy/xindy-2.4/modules/ord/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/modules/ord/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. diff --git a/Build/source/utils/xindy/xindy-2.4/modules/rules/Makefile.in b/Build/source/utils/xindy/xindy-2.4/modules/rules/Makefile.in index c069034f23c..43ae4a4a5c6 100644 --- a/Build/source/utils/xindy/xindy-2.4/modules/rules/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/modules/rules/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. diff --git a/Build/source/utils/xindy/xindy-2.4/modules/styles/Makefile.in b/Build/source/utils/xindy/xindy-2.4/modules/styles/Makefile.in index 2fceeb29559..b71ba5e6f8e 100644 --- a/Build/source/utils/xindy/xindy-2.4/modules/styles/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/modules/styles/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. diff --git a/Build/source/utils/xindy/xindy-2.4/src/Makefile.in b/Build/source/utils/xindy/xindy-2.4/src/Makefile.in index df950ee04b5..9236f9b0c1c 100644 --- a/Build/source/utils/xindy/xindy-2.4/src/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/src/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. diff --git a/Build/source/utils/xindy/xindy-2.4/tex2xindy/Makefile.in b/Build/source/utils/xindy/xindy-2.4/tex2xindy/Makefile.in index 14d0b47af38..2a2ec690fbe 100644 --- a/Build/source/utils/xindy/xindy-2.4/tex2xindy/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/tex2xindy/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. diff --git a/Build/source/utils/xindy/xindy-2.4/user-commands/Makefile.in b/Build/source/utils/xindy/xindy-2.4/user-commands/Makefile.in index 2703d3171b8..57853ac8638 100644 --- a/Build/source/utils/xindy/xindy-2.4/user-commands/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/user-commands/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. diff --git a/Build/source/utils/xpdfopen/ChangeLog b/Build/source/utils/xpdfopen/ChangeLog index f0ec83b2125..a68ea7bebb1 100644 --- a/Build/source/utils/xpdfopen/ChangeLog +++ b/Build/source/utils/xpdfopen/ChangeLog @@ -1,3 +1,7 @@ +2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Avoid use of deprecated INCLUDES. + 2012-03-29 Peter Breitenlohner <peb@mppmu.mpg.de> * utils.c: Move extern decl from here ... diff --git a/Build/source/utils/xpdfopen/Makefile.am b/Build/source/utils/xpdfopen/Makefile.am index 96289a5738b..9c259383f83 100644 --- a/Build/source/utils/xpdfopen/Makefile.am +++ b/Build/source/utils/xpdfopen/Makefile.am @@ -5,8 +5,8 @@ ## ACLOCAL_AMFLAGS = -I ../../m4 +AM_CPPFLAGS = $(X_CFLAGS) AM_CFLAGS = $(WARNING_CFLAGS) -INCLUDES = $(X_CFLAGS) LDADD = $(X_LIBS) -lX11 -lXmu $(X_EXTRA_LIBS) diff --git a/Build/source/utils/xpdfopen/Makefile.in b/Build/source/utils/xpdfopen/Makefile.in index 37d5d68d81e..965af8d4b2c 100644 --- a/Build/source/utils/xpdfopen/Makefile.in +++ b/Build/source/utils/xpdfopen/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. @@ -241,8 +241,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 +AM_CPPFLAGS = $(X_CFLAGS) AM_CFLAGS = $(WARNING_CFLAGS) -INCLUDES = $(X_CFLAGS) LDADD = $(X_LIBS) -lX11 -lXmu $(X_EXTRA_LIBS) common_sources = sendx.c sendx.h utils.c utils.h xpdfopen.h pdfopen_SOURCES = pdfopen.c $(common_sources) diff --git a/Build/source/utils/xpdfopen/aclocal.m4 b/Build/source/utils/xpdfopen/aclocal.m4 index a7ba883eeed..d9ad5fe21b5 100644 --- a/Build/source/utils/xpdfopen/aclocal.m4 +++ b/Build/source/utils/xpdfopen/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]))]) |