summaryrefslogtreecommitdiff
path: root/Build/source/utils/pmx
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-11-20 11:21:26 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-11-20 11:21:26 +0000
commit6c35e87bdc5a3f64833dbbc42e7d42e683db9d5b (patch)
tree3d6c2b1c91966d75a1815cfb28d1599814261399 /Build/source/utils/pmx
parentc1c530d70568b0a4bca08c3c96acee24bf44f7b1 (diff)
automake 1.12.5
*/Makefile.am: Avoid use of deprecated INCLUDES web2c: Add (c)tangleboot dependencies git-svn-id: svn://tug.org/texlive/trunk@28314 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/pmx')
-rw-r--r--Build/source/utils/pmx/ChangeLog6
-rw-r--r--Build/source/utils/pmx/Makefile.am16
-rw-r--r--Build/source/utils/pmx/Makefile.in203
-rw-r--r--Build/source/utils/pmx/aclocal.m46
-rwxr-xr-xBuild/source/utils/pmx/configure10
-rw-r--r--Build/source/utils/pmx/configure.ac10
-rwxr-xr-xBuild/source/utils/pmx/pmx2pdf.lua158
7 files changed, 57 insertions, 352 deletions
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 )