summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-03-28 09:15:53 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-03-28 09:15:53 +0000
commit68281af04144dc6c216436cdf9e3ceab3c7a80ea (patch)
tree0f58348068d46cb8121637b0806ac8accfebb96b /Build
parente346d80f3e4b476b95b7ce6ded11adcc88c99275 (diff)
pmx: Update build system and enable cross compilation
git-svn-id: svn://tug.org/texlive/trunk@25759 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rwxr-xr-xBuild/source/configure15
-rwxr-xr-xBuild/source/libs/configure15
-rwxr-xr-xBuild/source/texk/configure15
-rw-r--r--Build/source/utils/README5
-rwxr-xr-xBuild/source/utils/configure15
-rw-r--r--Build/source/utils/pmx/ChangeLog11
-rw-r--r--Build/source/utils/pmx/Makefile.am27
-rw-r--r--Build/source/utils/pmx/Makefile.in245
-rw-r--r--Build/source/utils/pmx/README13
-rw-r--r--Build/source/utils/pmx/ac/withenable.ac2
-rw-r--r--Build/source/utils/pmx/aclocal.m41
-rw-r--r--Build/source/utils/pmx/arith.h3
-rw-r--r--Build/source/utils/pmx/configure.ac18
-rw-r--r--Build/source/utils/pmx/pmx-2.6.17-PATCHES/TL-Changes5
-rw-r--r--Build/source/utils/pmx/pmx-2.6.17/pmxab.c (renamed from Build/source/utils/pmx/pmx-2.6.17/pmx2617.c)0
15 files changed, 177 insertions, 213 deletions
diff --git a/Build/source/configure b/Build/source/configure
index e31aa4a6b3b..0232043dcab 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -3905,24 +3905,15 @@ if test "${enable_pmx+set}" = set; then :
enableval=$enable_pmx;
fi
case $enable_pmx in #(
- yes) :
- if test "x$cross_compiling" = xyes; then :
- as_fn_error $? "Unable to cross compile pmx" "$LINENO" 5
-fi ;; #(
- no) :
+ yes|no) :
;; #(
*) :
- if test "x$cross_compiling" = xyes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Cross compiling -> \`--disable-pmx'" >&5
-$as_echo "$as_me: Cross compiling -> \`--disable-pmx'" >&6;}
- enable_pmx=no
- ac_configure_args="$ac_configure_args '--disable-pmx'"
- else
+
enable_pmx=$enable_all_pkgs
{ $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-pmx=$enable_pmx'" >&5
$as_echo "$as_me: Assuming \`--enable-pmx=$enable_pmx'" >&6;}
ac_configure_args="$ac_configure_args '--enable-pmx=$enable_pmx'"
- fi ;;
+ ;;
esac
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 08bae746fe8..8a1a95dd6c1 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -3230,24 +3230,15 @@ if test "${enable_pmx+set}" = set; then :
enableval=$enable_pmx;
fi
case $enable_pmx in #(
- yes) :
- if test "x$cross_compiling" = xyes; then :
- as_fn_error $? "Unable to cross compile pmx" "$LINENO" 5
-fi ;; #(
- no) :
+ yes|no) :
;; #(
*) :
- if test "x$cross_compiling" = xyes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Cross compiling -> \`--disable-pmx'" >&5
-$as_echo "$as_me: Cross compiling -> \`--disable-pmx'" >&6;}
- enable_pmx=no
- ac_configure_args="$ac_configure_args '--disable-pmx'"
- else
+
enable_pmx=$enable_all_pkgs
{ $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-pmx=$enable_pmx'" >&5
$as_echo "$as_me: Assuming \`--enable-pmx=$enable_pmx'" >&6;}
ac_configure_args="$ac_configure_args '--enable-pmx=$enable_pmx'"
- fi ;;
+ ;;
esac
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index cf550301db9..e97d83f408c 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -3250,24 +3250,15 @@ if test "${enable_pmx+set}" = set; then :
enableval=$enable_pmx;
fi
case $enable_pmx in #(
- yes) :
- if test "x$cross_compiling" = xyes; then :
- as_fn_error $? "Unable to cross compile pmx" "$LINENO" 5
-fi ;; #(
- no) :
+ yes|no) :
;; #(
*) :
- if test "x$cross_compiling" = xyes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Cross compiling -> \`--disable-pmx'" >&5
-$as_echo "$as_me: Cross compiling -> \`--disable-pmx'" >&6;}
- enable_pmx=no
- ac_configure_args="$ac_configure_args '--disable-pmx'"
- else
+
enable_pmx=$enable_all_pkgs
{ $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-pmx=$enable_pmx'" >&5
$as_echo "$as_me: Assuming \`--enable-pmx=$enable_pmx'" >&6;}
ac_configure_args="$ac_configure_args '--enable-pmx=$enable_pmx'"
- fi ;;
+ ;;
esac
diff --git a/Build/source/utils/README b/Build/source/utils/README
index 3791dd47e6f..bbad52fa840 100644
--- a/Build/source/utils/README
+++ b/Build/source/utils/README
@@ -12,9 +12,8 @@ asymptote 2.13 - checked 19jun11
chktex 1.6.4 - checked 25apr11
http://baruch.ev-en.org/proj/chktex/chktex-1.6.4.tar.gz
-pmx 2.6.17 - checked 27mar12
- ftp://linus.cs.queensu.ca/pmx-2.6.17.tar.gz
- (The version on CTAN is different)
+pmx 2.6.17 - checked 28mar12
+ http://mirror.ctan.org/support/pmx/
ps2eps 1.68 - checked 25apr11
http://tm.uka.de/~bless/ps2eps
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index f626a07dd61..e0e02498b18 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -3227,24 +3227,15 @@ if test "${enable_pmx+set}" = set; then :
enableval=$enable_pmx;
fi
case $enable_pmx in #(
- yes) :
- if test "x$cross_compiling" = xyes; then :
- as_fn_error $? "Unable to cross compile pmx" "$LINENO" 5
-fi ;; #(
- no) :
+ yes|no) :
;; #(
*) :
- if test "x$cross_compiling" = xyes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Cross compiling -> \`--disable-pmx'" >&5
-$as_echo "$as_me: Cross compiling -> \`--disable-pmx'" >&6;}
- enable_pmx=no
- ac_configure_args="$ac_configure_args '--disable-pmx'"
- else
+
enable_pmx=$enable_all_pkgs
{ $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-pmx=$enable_pmx'" >&5
$as_echo "$as_me: Assuming \`--enable-pmx=$enable_pmx'" >&6;}
ac_configure_args="$ac_configure_args '--enable-pmx=$enable_pmx'"
- fi ;;
+ ;;
esac
diff --git a/Build/source/utils/pmx/ChangeLog b/Build/source/utils/pmx/ChangeLog
new file mode 100644
index 00000000000..55f9ad34d9c
--- /dev/null
+++ b/Build/source/utils/pmx/ChangeLog
@@ -0,0 +1,11 @@
+2012-03-28 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * arith.h (new): Dummy header to avoid the need to run arithchk.
+ * Makefile.am, configure.ac: Modified to allow cross compilation.
+
+2012-03-26 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Adapt pmx-2.6.17 to the TeX Live build system.
+
+Copyright (C) 2012 Peter Breitenlohner <tex-live@tug.org>
+You may freely use, modify and/or distribute this file.
diff --git a/Build/source/utils/pmx/Makefile.am b/Build/source/utils/pmx/Makefile.am
index ca6538cafed..1e91f08e1e5 100644
--- a/Build/source/utils/pmx/Makefile.am
+++ b/Build/source/utils/pmx/Makefile.am
@@ -15,32 +15,21 @@ dist-hook:
rm -rf `find $(distdir) -name .svn`
INCLUDES = -I$(srcdir)/$(PMX_TREE)/libf2c
-AM_CPPFLAGS = -DNON_UNIX_STDIO
AM_CFLAGS = #$(WARNING_CFLAGS)
bin_PROGRAMS = pmxab scor2prt
-nodist_pmxab_SOURCES = pmxab.c
-
-pmxab_LDADD = libf2c.a
+pmxab_SOURCES = $(PMX_TREE)/pmxab.c
scor2prt_SOURCES = $(PMX_TREE)/scor2prt.c
-scor2prt_LDADD = libf2c.a
-
-noinst_PROGRAMS = arithchk
-
-arithchk_SOURCES = $(PMX_TREE)/libf2c/arithchk.c
-
-arithchk_CPPFLAGS = $(ARITHCHK_CPPFLAGS)
-
-arith.h: arithchk$(EXEEXT)
- ./arithchk >$@
+LDADD = libf2c.a
noinst_LIBRARIES = libf2c.a
## libf2c headers
libf2c_a_SOURCES = \
+ arith.h \
$(PMX_TREE)/libf2c/f2c.h \
$(PMX_TREE)/libf2c/fio.h \
$(PMX_TREE)/libf2c/fmt.h \
@@ -69,7 +58,9 @@ libf2c_a_SOURCES += \
$(PMX_TREE)/libf2c/s_stop.c \
$(PMX_TREE)/libf2c/sig_die.c \
$(PMX_TREE)/libf2c/signal_.c \
- $(PMX_TREE)/libf2c/system_.c \
+ $(PMX_TREE)/libf2c/system_.c
+## MISC (not used for pmx)
+EXTRA_libf2c_a_SOURCES = \
$(PMX_TREE)/libf2c/uninit.c
## POW
libf2c_a_SOURCES += \
@@ -230,7 +221,7 @@ libf2c_a_SOURCES += \
$(PMX_TREE)/libf2c/etime_.c
## QINT (unused)
-EXTRA_libf2c_a_SOURCES = \
+EXTRA_libf2c_a_SOURCES += \
$(PMX_TREE)/libf2c/ftell64_.c \
$(PMX_TREE)/libf2c/pow_qq.c \
$(PMX_TREE)/libf2c/qbitbits.c \
@@ -239,7 +230,3 @@ EXTRA_libf2c_a_SOURCES = \
EXTRA_libf2c_a_SOURCES += \
$(PMX_TREE)/libf2c/signbit.c
-$(libf2c_a_OBJECTS): arith.h
-
-DISTCLEANFILES = arith.h pmxab.c
-
diff --git a/Build/source/utils/pmx/Makefile.in b/Build/source/utils/pmx/Makefile.in
index c2f31300c89..711629253c8 100644
--- a/Build/source/utils/pmx/Makefile.in
+++ b/Build/source/utils/pmx/Makefile.in
@@ -34,26 +34,26 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
bin_PROGRAMS = pmxab$(EXEEXT) scor2prt$(EXEEXT)
-noinst_PROGRAMS = arithchk$(EXEEXT)
subdir = .
-DIST_COMMON = $(am__configure_deps) $(srcdir)/../../build-aux/depcomp \
+DIST_COMMON = README $(am__configure_deps) \
+ $(srcdir)/../../build-aux/depcomp \
$(srcdir)/../../build-aux/install-sh \
$(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(top_srcdir)/configure \
- $(top_srcdir)/pmx-2.6.17/pmx2617.c \
../../build-aux/config.guess ../../build-aux/config.sub \
../../build-aux/depcomp ../../build-aux/install-sh \
../../build-aux/ltmain.sh ../../build-aux/missing \
- ../../build-aux/texinfo.tex ../../build-aux/ylwrap
+ ../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \
- $(top_srcdir)/version.ac $(top_srcdir)/configure.ac
+ $(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES = pmxab.c
+CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
LIBRARIES = $(noinst_LIBRARIES)
AR = ar
@@ -66,60 +66,58 @@ am_libf2c_a_OBJECTS = abort_.$(OBJEXT) cabs.$(OBJEXT) derf_.$(OBJEXT) \
getenv_.$(OBJEXT) i77vers.$(OBJEXT) iargc_.$(OBJEXT) \
main.$(OBJEXT) s_paus.$(OBJEXT) s_rnge.$(OBJEXT) \
s_stop.$(OBJEXT) sig_die.$(OBJEXT) signal_.$(OBJEXT) \
- system_.$(OBJEXT) uninit.$(OBJEXT) pow_ci.$(OBJEXT) \
- pow_dd.$(OBJEXT) pow_di.$(OBJEXT) pow_hh.$(OBJEXT) \
- pow_ii.$(OBJEXT) pow_ri.$(OBJEXT) pow_zi.$(OBJEXT) \
- pow_zz.$(OBJEXT) c_abs.$(OBJEXT) c_cos.$(OBJEXT) \
- c_div.$(OBJEXT) c_exp.$(OBJEXT) c_log.$(OBJEXT) \
- c_sin.$(OBJEXT) c_sqrt.$(OBJEXT) z_abs.$(OBJEXT) \
- z_cos.$(OBJEXT) z_div.$(OBJEXT) z_exp.$(OBJEXT) \
- z_log.$(OBJEXT) z_sin.$(OBJEXT) z_sqrt.$(OBJEXT) \
- r_abs.$(OBJEXT) r_acos.$(OBJEXT) r_asin.$(OBJEXT) \
- r_atan.$(OBJEXT) r_atn2.$(OBJEXT) r_cnjg.$(OBJEXT) \
- r_cos.$(OBJEXT) r_cosh.$(OBJEXT) r_dim.$(OBJEXT) \
- r_exp.$(OBJEXT) r_imag.$(OBJEXT) r_int.$(OBJEXT) \
- r_lg10.$(OBJEXT) r_log.$(OBJEXT) r_mod.$(OBJEXT) \
- r_nint.$(OBJEXT) r_sign.$(OBJEXT) r_sin.$(OBJEXT) \
- r_sinh.$(OBJEXT) r_sqrt.$(OBJEXT) r_tan.$(OBJEXT) \
- r_tanh.$(OBJEXT) d_abs.$(OBJEXT) d_acos.$(OBJEXT) \
- d_asin.$(OBJEXT) d_atan.$(OBJEXT) d_atn2.$(OBJEXT) \
- d_cnjg.$(OBJEXT) d_cos.$(OBJEXT) d_cosh.$(OBJEXT) \
- d_dim.$(OBJEXT) d_exp.$(OBJEXT) d_imag.$(OBJEXT) \
- d_int.$(OBJEXT) d_lg10.$(OBJEXT) d_log.$(OBJEXT) \
- d_mod.$(OBJEXT) d_nint.$(OBJEXT) d_prod.$(OBJEXT) \
- d_sign.$(OBJEXT) d_sin.$(OBJEXT) d_sinh.$(OBJEXT) \
- d_sqrt.$(OBJEXT) d_tan.$(OBJEXT) d_tanh.$(OBJEXT) \
- i_abs.$(OBJEXT) i_dim.$(OBJEXT) i_dnnt.$(OBJEXT) \
- i_indx.$(OBJEXT) i_len.$(OBJEXT) i_mod.$(OBJEXT) \
- i_nint.$(OBJEXT) i_sign.$(OBJEXT) lbitbits.$(OBJEXT) \
- lbitshft.$(OBJEXT) h_abs.$(OBJEXT) h_dim.$(OBJEXT) \
- h_dnnt.$(OBJEXT) h_indx.$(OBJEXT) h_len.$(OBJEXT) \
- h_mod.$(OBJEXT) h_nint.$(OBJEXT) h_sign.$(OBJEXT) \
- hl_ge.$(OBJEXT) hl_gt.$(OBJEXT) hl_le.$(OBJEXT) \
- hl_lt.$(OBJEXT) l_ge.$(OBJEXT) l_gt.$(OBJEXT) l_le.$(OBJEXT) \
- l_lt.$(OBJEXT) ef1asc_.$(OBJEXT) ef1cmc_.$(OBJEXT) \
- f77_aloc.$(OBJEXT) s_cat.$(OBJEXT) s_cmp.$(OBJEXT) \
- s_copy.$(OBJEXT) backspac.$(OBJEXT) close.$(OBJEXT) \
- dfe.$(OBJEXT) dolio.$(OBJEXT) due.$(OBJEXT) endfile.$(OBJEXT) \
- err.$(OBJEXT) fmt.$(OBJEXT) fmtlib.$(OBJEXT) ftell_.$(OBJEXT) \
- iio.$(OBJEXT) ilnw.$(OBJEXT) inquire.$(OBJEXT) lread.$(OBJEXT) \
- lwrite.$(OBJEXT) open.$(OBJEXT) rdfmt.$(OBJEXT) \
- rewind.$(OBJEXT) rsfe.$(OBJEXT) rsli.$(OBJEXT) rsne.$(OBJEXT) \
- sfe.$(OBJEXT) sue.$(OBJEXT) typesize.$(OBJEXT) uio.$(OBJEXT) \
- util.$(OBJEXT) wref.$(OBJEXT) wrtfmt.$(OBJEXT) wsfe.$(OBJEXT) \
- wsle.$(OBJEXT) wsne.$(OBJEXT) xwsne.$(OBJEXT) dtime_.$(OBJEXT) \
- etime_.$(OBJEXT)
+ system_.$(OBJEXT) pow_ci.$(OBJEXT) pow_dd.$(OBJEXT) \
+ pow_di.$(OBJEXT) pow_hh.$(OBJEXT) pow_ii.$(OBJEXT) \
+ pow_ri.$(OBJEXT) pow_zi.$(OBJEXT) pow_zz.$(OBJEXT) \
+ c_abs.$(OBJEXT) c_cos.$(OBJEXT) c_div.$(OBJEXT) \
+ c_exp.$(OBJEXT) c_log.$(OBJEXT) c_sin.$(OBJEXT) \
+ c_sqrt.$(OBJEXT) z_abs.$(OBJEXT) z_cos.$(OBJEXT) \
+ z_div.$(OBJEXT) z_exp.$(OBJEXT) z_log.$(OBJEXT) \
+ z_sin.$(OBJEXT) z_sqrt.$(OBJEXT) r_abs.$(OBJEXT) \
+ r_acos.$(OBJEXT) r_asin.$(OBJEXT) r_atan.$(OBJEXT) \
+ r_atn2.$(OBJEXT) r_cnjg.$(OBJEXT) r_cos.$(OBJEXT) \
+ r_cosh.$(OBJEXT) r_dim.$(OBJEXT) r_exp.$(OBJEXT) \
+ r_imag.$(OBJEXT) r_int.$(OBJEXT) r_lg10.$(OBJEXT) \
+ r_log.$(OBJEXT) r_mod.$(OBJEXT) r_nint.$(OBJEXT) \
+ r_sign.$(OBJEXT) r_sin.$(OBJEXT) r_sinh.$(OBJEXT) \
+ r_sqrt.$(OBJEXT) r_tan.$(OBJEXT) r_tanh.$(OBJEXT) \
+ d_abs.$(OBJEXT) d_acos.$(OBJEXT) d_asin.$(OBJEXT) \
+ d_atan.$(OBJEXT) d_atn2.$(OBJEXT) d_cnjg.$(OBJEXT) \
+ d_cos.$(OBJEXT) d_cosh.$(OBJEXT) d_dim.$(OBJEXT) \
+ d_exp.$(OBJEXT) d_imag.$(OBJEXT) d_int.$(OBJEXT) \
+ d_lg10.$(OBJEXT) d_log.$(OBJEXT) d_mod.$(OBJEXT) \
+ d_nint.$(OBJEXT) d_prod.$(OBJEXT) d_sign.$(OBJEXT) \
+ d_sin.$(OBJEXT) d_sinh.$(OBJEXT) d_sqrt.$(OBJEXT) \
+ d_tan.$(OBJEXT) d_tanh.$(OBJEXT) i_abs.$(OBJEXT) \
+ i_dim.$(OBJEXT) i_dnnt.$(OBJEXT) i_indx.$(OBJEXT) \
+ i_len.$(OBJEXT) i_mod.$(OBJEXT) i_nint.$(OBJEXT) \
+ i_sign.$(OBJEXT) lbitbits.$(OBJEXT) lbitshft.$(OBJEXT) \
+ h_abs.$(OBJEXT) h_dim.$(OBJEXT) h_dnnt.$(OBJEXT) \
+ h_indx.$(OBJEXT) h_len.$(OBJEXT) h_mod.$(OBJEXT) \
+ h_nint.$(OBJEXT) h_sign.$(OBJEXT) hl_ge.$(OBJEXT) \
+ hl_gt.$(OBJEXT) hl_le.$(OBJEXT) hl_lt.$(OBJEXT) l_ge.$(OBJEXT) \
+ l_gt.$(OBJEXT) l_le.$(OBJEXT) l_lt.$(OBJEXT) ef1asc_.$(OBJEXT) \
+ ef1cmc_.$(OBJEXT) f77_aloc.$(OBJEXT) s_cat.$(OBJEXT) \
+ s_cmp.$(OBJEXT) s_copy.$(OBJEXT) backspac.$(OBJEXT) \
+ close.$(OBJEXT) dfe.$(OBJEXT) dolio.$(OBJEXT) due.$(OBJEXT) \
+ endfile.$(OBJEXT) err.$(OBJEXT) fmt.$(OBJEXT) fmtlib.$(OBJEXT) \
+ ftell_.$(OBJEXT) iio.$(OBJEXT) ilnw.$(OBJEXT) \
+ inquire.$(OBJEXT) lread.$(OBJEXT) lwrite.$(OBJEXT) \
+ open.$(OBJEXT) rdfmt.$(OBJEXT) rewind.$(OBJEXT) rsfe.$(OBJEXT) \
+ rsli.$(OBJEXT) rsne.$(OBJEXT) sfe.$(OBJEXT) sue.$(OBJEXT) \
+ typesize.$(OBJEXT) uio.$(OBJEXT) util.$(OBJEXT) wref.$(OBJEXT) \
+ wrtfmt.$(OBJEXT) wsfe.$(OBJEXT) wsle.$(OBJEXT) wsne.$(OBJEXT) \
+ xwsne.$(OBJEXT) dtime_.$(OBJEXT) etime_.$(OBJEXT)
libf2c_a_OBJECTS = $(am_libf2c_a_OBJECTS)
am__installdirs = "$(DESTDIR)$(bindir)"
-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
-am_arithchk_OBJECTS = arithchk-arithchk.$(OBJEXT)
-arithchk_OBJECTS = $(am_arithchk_OBJECTS)
-arithchk_LDADD = $(LDADD)
-nodist_pmxab_OBJECTS = pmxab.$(OBJEXT)
-pmxab_OBJECTS = $(nodist_pmxab_OBJECTS)
+PROGRAMS = $(bin_PROGRAMS)
+am_pmxab_OBJECTS = pmxab.$(OBJEXT)
+pmxab_OBJECTS = $(am_pmxab_OBJECTS)
+pmxab_LDADD = $(LDADD)
pmxab_DEPENDENCIES = libf2c.a
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
@@ -130,10 +128,9 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libf2c_a_SOURCES) $(EXTRA_libf2c_a_SOURCES) \
- $(arithchk_SOURCES) $(nodist_pmxab_SOURCES) \
- $(scor2prt_SOURCES)
+ $(pmxab_SOURCES) $(scor2prt_SOURCES)
DIST_SOURCES = $(libf2c_a_SOURCES) $(EXTRA_libf2c_a_SOURCES) \
- $(arithchk_SOURCES) $(scor2prt_SOURCES)
+ $(pmxab_SOURCES) $(scor2prt_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -153,7 +150,7 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
-ARITHCHK_CPPFLAGS = @ARITHCHK_CPPFLAGS@
+AM_CPPFLAGS = @AM_CPPFLAGS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -246,29 +243,25 @@ top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
EXTRA_DIST = $(PMX_TREE) $(PMX_TREE)-PATCHES
INCLUDES = -I$(srcdir)/$(PMX_TREE)/libf2c
-AM_CPPFLAGS = -DNON_UNIX_STDIO
AM_CFLAGS = #$(WARNING_CFLAGS)
-nodist_pmxab_SOURCES = pmxab.c
-pmxab_LDADD = libf2c.a
+pmxab_SOURCES = $(PMX_TREE)/pmxab.c
scor2prt_SOURCES = $(PMX_TREE)/scor2prt.c
-scor2prt_LDADD = libf2c.a
-arithchk_SOURCES = $(PMX_TREE)/libf2c/arithchk.c
-arithchk_CPPFLAGS = $(ARITHCHK_CPPFLAGS)
+LDADD = libf2c.a
noinst_LIBRARIES = libf2c.a
-libf2c_a_SOURCES = $(PMX_TREE)/libf2c/f2c.h $(PMX_TREE)/libf2c/fio.h \
- $(PMX_TREE)/libf2c/fmt.h $(PMX_TREE)/libf2c/fp.h \
- $(PMX_TREE)/libf2c/lio.h $(PMX_TREE)/libf2c/rawio.h \
- $(PMX_TREE)/libf2c/signal1.h $(PMX_TREE)/libf2c/sysdep1.h \
- $(PMX_TREE)/libf2c/abort_.c $(PMX_TREE)/libf2c/cabs.c \
- $(PMX_TREE)/libf2c/derf_.c $(PMX_TREE)/libf2c/derfc_.c \
- $(PMX_TREE)/libf2c/erf_.c $(PMX_TREE)/libf2c/erfc_.c \
- $(PMX_TREE)/libf2c/exit_.c $(PMX_TREE)/libf2c/f77vers.c \
- $(PMX_TREE)/libf2c/getarg_.c $(PMX_TREE)/libf2c/getenv_.c \
- $(PMX_TREE)/libf2c/i77vers.c $(PMX_TREE)/libf2c/iargc_.c \
- $(PMX_TREE)/libf2c/main.c $(PMX_TREE)/libf2c/s_paus.c \
- $(PMX_TREE)/libf2c/s_rnge.c $(PMX_TREE)/libf2c/s_stop.c \
- $(PMX_TREE)/libf2c/sig_die.c $(PMX_TREE)/libf2c/signal_.c \
- $(PMX_TREE)/libf2c/system_.c $(PMX_TREE)/libf2c/uninit.c \
+libf2c_a_SOURCES = arith.h $(PMX_TREE)/libf2c/f2c.h \
+ $(PMX_TREE)/libf2c/fio.h $(PMX_TREE)/libf2c/fmt.h \
+ $(PMX_TREE)/libf2c/fp.h $(PMX_TREE)/libf2c/lio.h \
+ $(PMX_TREE)/libf2c/rawio.h $(PMX_TREE)/libf2c/signal1.h \
+ $(PMX_TREE)/libf2c/sysdep1.h $(PMX_TREE)/libf2c/abort_.c \
+ $(PMX_TREE)/libf2c/cabs.c $(PMX_TREE)/libf2c/derf_.c \
+ $(PMX_TREE)/libf2c/derfc_.c $(PMX_TREE)/libf2c/erf_.c \
+ $(PMX_TREE)/libf2c/erfc_.c $(PMX_TREE)/libf2c/exit_.c \
+ $(PMX_TREE)/libf2c/f77vers.c $(PMX_TREE)/libf2c/getarg_.c \
+ $(PMX_TREE)/libf2c/getenv_.c $(PMX_TREE)/libf2c/i77vers.c \
+ $(PMX_TREE)/libf2c/iargc_.c $(PMX_TREE)/libf2c/main.c \
+ $(PMX_TREE)/libf2c/s_paus.c $(PMX_TREE)/libf2c/s_rnge.c \
+ $(PMX_TREE)/libf2c/s_stop.c $(PMX_TREE)/libf2c/sig_die.c \
+ $(PMX_TREE)/libf2c/signal_.c $(PMX_TREE)/libf2c/system_.c \
$(PMX_TREE)/libf2c/pow_ci.c $(PMX_TREE)/libf2c/pow_dd.c \
$(PMX_TREE)/libf2c/pow_di.c $(PMX_TREE)/libf2c/pow_hh.c \
$(PMX_TREE)/libf2c/pow_ii.c $(PMX_TREE)/libf2c/pow_ri.c \
@@ -336,10 +329,10 @@ libf2c_a_SOURCES = $(PMX_TREE)/libf2c/f2c.h $(PMX_TREE)/libf2c/fio.h \
$(PMX_TREE)/libf2c/wsle.c $(PMX_TREE)/libf2c/wsne.c \
$(PMX_TREE)/libf2c/xwsne.c $(PMX_TREE)/libf2c/dtime_.c \
$(PMX_TREE)/libf2c/etime_.c
-EXTRA_libf2c_a_SOURCES = $(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
-DISTCLEANFILES = arith.h pmxab.c
+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
all: all-am
.SUFFIXES:
@@ -422,12 +415,6 @@ uninstall-binPROGRAMS:
clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-
-clean-noinstPROGRAMS:
- -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
-arithchk$(EXEEXT): $(arithchk_OBJECTS) $(arithchk_DEPENDENCIES) $(EXTRA_arithchk_DEPENDENCIES)
- @rm -f arithchk$(EXEEXT)
- $(LINK) $(arithchk_OBJECTS) $(arithchk_LDADD) $(LIBS)
pmxab$(EXEEXT): $(pmxab_OBJECTS) $(pmxab_DEPENDENCIES) $(EXTRA_pmxab_DEPENDENCIES)
@rm -f pmxab$(EXEEXT)
$(LINK) $(pmxab_OBJECTS) $(pmxab_LDADD) $(LIBS)
@@ -442,7 +429,6 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/abort_.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arithchk-arithchk.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/backspac.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c_abs.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c_cos.Po@am__quote@
@@ -883,20 +869,6 @@ system_.obj: $(PMX_TREE)/libf2c/system_.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o system_.obj `if test -f '$(PMX_TREE)/libf2c/system_.c'; then $(CYGPATH_W) '$(PMX_TREE)/libf2c/system_.c'; else $(CYGPATH_W) '$(srcdir)/$(PMX_TREE)/libf2c/system_.c'; fi`
-uninit.o: $(PMX_TREE)/libf2c/uninit.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uninit.o -MD -MP -MF $(DEPDIR)/uninit.Tpo -c -o uninit.o `test -f '$(PMX_TREE)/libf2c/uninit.c' || echo '$(srcdir)/'`$(PMX_TREE)/libf2c/uninit.c
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/uninit.Tpo $(DEPDIR)/uninit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(PMX_TREE)/libf2c/uninit.c' object='uninit.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uninit.o `test -f '$(PMX_TREE)/libf2c/uninit.c' || echo '$(srcdir)/'`$(PMX_TREE)/libf2c/uninit.c
-
-uninit.obj: $(PMX_TREE)/libf2c/uninit.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uninit.obj -MD -MP -MF $(DEPDIR)/uninit.Tpo -c -o uninit.obj `if test -f '$(PMX_TREE)/libf2c/uninit.c'; then $(CYGPATH_W) '$(PMX_TREE)/libf2c/uninit.c'; else $(CYGPATH_W) '$(srcdir)/$(PMX_TREE)/libf2c/uninit.c'; fi`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/uninit.Tpo $(DEPDIR)/uninit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(PMX_TREE)/libf2c/uninit.c' object='uninit.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uninit.obj `if test -f '$(PMX_TREE)/libf2c/uninit.c'; then $(CYGPATH_W) '$(PMX_TREE)/libf2c/uninit.c'; else $(CYGPATH_W) '$(srcdir)/$(PMX_TREE)/libf2c/uninit.c'; fi`
-
pow_ci.o: $(PMX_TREE)/libf2c/pow_ci.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pow_ci.o -MD -MP -MF $(DEPDIR)/pow_ci.Tpo -c -o pow_ci.o `test -f '$(PMX_TREE)/libf2c/pow_ci.c' || echo '$(srcdir)/'`$(PMX_TREE)/libf2c/pow_ci.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pow_ci.Tpo $(DEPDIR)/pow_ci.Po
@@ -2759,6 +2731,20 @@ etime_.obj: $(PMX_TREE)/libf2c/etime_.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o etime_.obj `if test -f '$(PMX_TREE)/libf2c/etime_.c'; then $(CYGPATH_W) '$(PMX_TREE)/libf2c/etime_.c'; else $(CYGPATH_W) '$(srcdir)/$(PMX_TREE)/libf2c/etime_.c'; fi`
+uninit.o: $(PMX_TREE)/libf2c/uninit.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uninit.o -MD -MP -MF $(DEPDIR)/uninit.Tpo -c -o uninit.o `test -f '$(PMX_TREE)/libf2c/uninit.c' || echo '$(srcdir)/'`$(PMX_TREE)/libf2c/uninit.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/uninit.Tpo $(DEPDIR)/uninit.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(PMX_TREE)/libf2c/uninit.c' object='uninit.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uninit.o `test -f '$(PMX_TREE)/libf2c/uninit.c' || echo '$(srcdir)/'`$(PMX_TREE)/libf2c/uninit.c
+
+uninit.obj: $(PMX_TREE)/libf2c/uninit.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uninit.obj -MD -MP -MF $(DEPDIR)/uninit.Tpo -c -o uninit.obj `if test -f '$(PMX_TREE)/libf2c/uninit.c'; then $(CYGPATH_W) '$(PMX_TREE)/libf2c/uninit.c'; else $(CYGPATH_W) '$(srcdir)/$(PMX_TREE)/libf2c/uninit.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/uninit.Tpo $(DEPDIR)/uninit.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(PMX_TREE)/libf2c/uninit.c' object='uninit.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uninit.obj `if test -f '$(PMX_TREE)/libf2c/uninit.c'; then $(CYGPATH_W) '$(PMX_TREE)/libf2c/uninit.c'; else $(CYGPATH_W) '$(srcdir)/$(PMX_TREE)/libf2c/uninit.c'; fi`
+
ftell64_.o: $(PMX_TREE)/libf2c/ftell64_.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ftell64_.o -MD -MP -MF $(DEPDIR)/ftell64_.Tpo -c -o ftell64_.o `test -f '$(PMX_TREE)/libf2c/ftell64_.c' || echo '$(srcdir)/'`$(PMX_TREE)/libf2c/ftell64_.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ftell64_.Tpo $(DEPDIR)/ftell64_.Po
@@ -2829,19 +2815,19 @@ signbit.obj: $(PMX_TREE)/libf2c/signbit.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o signbit.obj `if test -f '$(PMX_TREE)/libf2c/signbit.c'; then $(CYGPATH_W) '$(PMX_TREE)/libf2c/signbit.c'; else $(CYGPATH_W) '$(srcdir)/$(PMX_TREE)/libf2c/signbit.c'; fi`
-arithchk-arithchk.o: $(PMX_TREE)/libf2c/arithchk.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(arithchk_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT arithchk-arithchk.o -MD -MP -MF $(DEPDIR)/arithchk-arithchk.Tpo -c -o arithchk-arithchk.o `test -f '$(PMX_TREE)/libf2c/arithchk.c' || echo '$(srcdir)/'`$(PMX_TREE)/libf2c/arithchk.c
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/arithchk-arithchk.Tpo $(DEPDIR)/arithchk-arithchk.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(PMX_TREE)/libf2c/arithchk.c' object='arithchk-arithchk.o' libtool=no @AMDEPBACKSLASH@
+pmxab.o: $(PMX_TREE)/pmxab.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmxab.o -MD -MP -MF $(DEPDIR)/pmxab.Tpo -c -o pmxab.o `test -f '$(PMX_TREE)/pmxab.c' || echo '$(srcdir)/'`$(PMX_TREE)/pmxab.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pmxab.Tpo $(DEPDIR)/pmxab.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(PMX_TREE)/pmxab.c' object='pmxab.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(arithchk_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o arithchk-arithchk.o `test -f '$(PMX_TREE)/libf2c/arithchk.c' || echo '$(srcdir)/'`$(PMX_TREE)/libf2c/arithchk.c
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmxab.o `test -f '$(PMX_TREE)/pmxab.c' || echo '$(srcdir)/'`$(PMX_TREE)/pmxab.c
-arithchk-arithchk.obj: $(PMX_TREE)/libf2c/arithchk.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(arithchk_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT arithchk-arithchk.obj -MD -MP -MF $(DEPDIR)/arithchk-arithchk.Tpo -c -o arithchk-arithchk.obj `if test -f '$(PMX_TREE)/libf2c/arithchk.c'; then $(CYGPATH_W) '$(PMX_TREE)/libf2c/arithchk.c'; else $(CYGPATH_W) '$(srcdir)/$(PMX_TREE)/libf2c/arithchk.c'; fi`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/arithchk-arithchk.Tpo $(DEPDIR)/arithchk-arithchk.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(PMX_TREE)/libf2c/arithchk.c' object='arithchk-arithchk.obj' libtool=no @AMDEPBACKSLASH@
+pmxab.obj: $(PMX_TREE)/pmxab.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmxab.obj -MD -MP -MF $(DEPDIR)/pmxab.Tpo -c -o pmxab.obj `if test -f '$(PMX_TREE)/pmxab.c'; then $(CYGPATH_W) '$(PMX_TREE)/pmxab.c'; else $(CYGPATH_W) '$(srcdir)/$(PMX_TREE)/pmxab.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pmxab.Tpo $(DEPDIR)/pmxab.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(PMX_TREE)/pmxab.c' object='pmxab.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(arithchk_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o arithchk-arithchk.obj `if test -f '$(PMX_TREE)/libf2c/arithchk.c'; then $(CYGPATH_W) '$(PMX_TREE)/libf2c/arithchk.c'; else $(CYGPATH_W) '$(srcdir)/$(PMX_TREE)/libf2c/arithchk.c'; fi`
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmxab.obj `if test -f '$(PMX_TREE)/pmxab.c'; then $(CYGPATH_W) '$(PMX_TREE)/pmxab.c'; else $(CYGPATH_W) '$(srcdir)/$(PMX_TREE)/pmxab.c'; fi`
scor2prt.o: $(PMX_TREE)/scor2prt.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT scor2prt.o -MD -MP -MF $(DEPDIR)/scor2prt.Tpo -c -o scor2prt.o `test -f '$(PMX_TREE)/scor2prt.c' || echo '$(srcdir)/'`$(PMX_TREE)/scor2prt.c
@@ -3107,7 +3093,6 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -3115,7 +3100,7 @@ maintainer-clean-generic:
clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \
- clean-noinstPROGRAMS mostlyclean-am
+ mostlyclean-am
distclean: distclean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -3188,18 +3173,17 @@ uninstall-am: uninstall-binPROGRAMS
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
- clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \
- clean-noinstPROGRAMS ctags dist dist-all dist-bzip2 dist-gzip \
- dist-hook dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
- dist-zip distcheck 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-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
+ clean-binPROGRAMS clean-generic clean-noinstLIBRARIES ctags \
+ dist dist-all dist-bzip2 dist-gzip dist-hook dist-lzip \
+ dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \
+ 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-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man 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
@@ -3209,11 +3193,6 @@ uninstall-am: uninstall-binPROGRAMS
dist-hook:
rm -rf `find $(distdir) -name .svn`
-arith.h: arithchk$(EXEEXT)
- ./arithchk >$@
-
-$(libf2c_a_OBJECTS): arith.h
-
# 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.
.NOEXPORT:
diff --git a/Build/source/utils/pmx/README b/Build/source/utils/pmx/README
new file mode 100644
index 00000000000..fb6c3cc6c05
--- /dev/null
+++ b/Build/source/utils/pmx/README
@@ -0,0 +1,13 @@
+Copyright (C) 2012 Peter Breitenlohner <tex-live@tug.org>
+You may freely use, modify and/or distribute this file.
+
+In order to build pmx we don't need the complete libf2c library.
+Specifically, we can omit uninit.c and with it the necessity to build and
+run arithchk in order to create the arith.h header file (which would make
+cross compilation impossible).
+
+From all the preprocessor defines arithchk could generate we only might need
+'VAX' (most probably irrelevant) and 'NO_LONG_LONG' which can be handled by
+the configure script. Thus an empty file arith.h suffices.
+
+
diff --git a/Build/source/utils/pmx/ac/withenable.ac b/Build/source/utils/pmx/ac/withenable.ac
index 92b8b0ea2fb..a77f24e150d 100644
--- a/Build/source/utils/pmx/ac/withenable.ac
+++ b/Build/source/utils/pmx/ac/withenable.ac
@@ -4,4 +4,4 @@ dnl Copyright (C) 2012 Peter Breitenlohner <tex-live@tug.org>
dnl You may freely use, modify and/or distribute this file.
dnl
## configure options and TL libraries required for pmx
-KPSE_ENABLE_PROG([pmx], , [native])
+KPSE_ENABLE_PROG([pmx])
diff --git a/Build/source/utils/pmx/aclocal.m4 b/Build/source/utils/pmx/aclocal.m4
index 6707d2f7d86..a0ccb48982e 100644
--- a/Build/source/utils/pmx/aclocal.m4
+++ b/Build/source/utils/pmx/aclocal.m4
@@ -1010,3 +1010,4 @@ AC_SUBST([am__untar])
]) # _AM_PROG_TAR
m4_include([../../m4/kpse-warnings.m4])
+m4_include([../../m4/kpse-win32.m4])
diff --git a/Build/source/utils/pmx/arith.h b/Build/source/utils/pmx/arith.h
new file mode 100644
index 00000000000..0ee9308ca06
--- /dev/null
+++ b/Build/source/utils/pmx/arith.h
@@ -0,0 +1,3 @@
+/* Copyright (C) 2012 Peter Breitenlohner <tex-live@tug.org>
+ * You may freely use, modify and/or distribute this file.
+ */
diff --git a/Build/source/utils/pmx/configure.ac b/Build/source/utils/pmx/configure.ac
index 0c6d87b8347..619ba223f67 100644
--- a/Build/source/utils/pmx/configure.ac
+++ b/Build/source/utils/pmx/configure.ac
@@ -9,7 +9,7 @@ dnl
m4_include([version.ac])[] dnl define pmx_version
AC_INIT([pmx for TeX Live], pmx_version, [tex-k@tug.org])
AC_PREREQ([2.65])
-AC_CONFIG_SRCDIR([pmx-]pmx_version[/scor2prt.c])
+AC_CONFIG_SRCDIR([pmx-]pmx_version[/pmxab.c])
AC_CONFIG_AUX_DIR([../../build-aux])
AC_CONFIG_MACRO_DIR([../../m4])
@@ -21,6 +21,15 @@ AC_PROG_CC
KPSE_COMPILER_WARNINGS
+dnl initial value for AM_CPPFLAGS
+AC_SUBST([AM_CPPFLAGS], ['-DNON_UNIX_STDIO'])
+
+dnl WIN32 has no <sys/times.h>
+KPSE_CHECK_WIN32
+if test "x$kpse_cv_have_win32" != xno; then
+ AM_CPPFLAGS="$AM_CPPPFLAGS -DUSE_CLOCK"
+fi
+
dnl Checks for programs.
AC_PROG_INSTALL
AC_PROG_LN_S
@@ -31,13 +40,8 @@ AC_SEARCH_LIBS([sqrt], [m])
AC_CHECK_SIZEOF([long long])
if test $ac_cv_sizeof_long_long -lt 8; then
- ARITHCHK_CPPFLAGS='-DNO_LONG_LONG -DNO_FPINIT'
-else
- ARITHCHK_CPPFLAGS='-DNO_FPINIT'
+ AM_CPPFLAGS="$AM_CPPPFLAGS -DNO_LONG_LONG"
fi
-AC_SUBST([ARITHCHK_CPPFLAGS])
-
-AC_CONFIG_LINKS([pmxab.c:pmx-]pmx_version[/pmx]m4_bpatsubsts(pmx_version, [\.], [])[.c])
AC_SUBST([PMX_TREE], [pmx-]pmx_version)
diff --git a/Build/source/utils/pmx/pmx-2.6.17-PATCHES/TL-Changes b/Build/source/utils/pmx/pmx-2.6.17-PATCHES/TL-Changes
index 73ea7f65136..d5b53310f25 100644
--- a/Build/source/utils/pmx/pmx-2.6.17-PATCHES/TL-Changes
+++ b/Build/source/utils/pmx/pmx-2.6.17-PATCHES/TL-Changes
@@ -1,5 +1,8 @@
Changes applied to the pmx-2.6.17 tree as obtained from:
- ftp://linus.cs.queensu.ca/pmx-2.6.17.tar.gz
+ http://www.ctan.org/tex-archive/support/pmx/
+
+Rename:
+ pmx2617.c -> pmxab.c
Remove:
Makefile.in
diff --git a/Build/source/utils/pmx/pmx-2.6.17/pmx2617.c b/Build/source/utils/pmx/pmx-2.6.17/pmxab.c
index 763d8505f50..763d8505f50 100644
--- a/Build/source/utils/pmx/pmx-2.6.17/pmx2617.c
+++ b/Build/source/utils/pmx/pmx-2.6.17/pmxab.c