summaryrefslogtreecommitdiff
path: root/Build/source/texk/psutils
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-01-13 13:03:22 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-01-13 13:03:22 +0000
commita8fb135db314d7fb3407051c5925eec99a0c3097 (patch)
tree6a5a41ec53e3d4f27222d1c02794cdcfc57dc55c /Build/source/texk/psutils
parentf028526edcba2838df64e33e27a36ef43b13cd64 (diff)
Rename libs/paper => libs/libpaper. Remove utils/songs
git-svn-id: svn://tug.org/texlive/trunk@32654 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/psutils')
-rw-r--r--Build/source/texk/psutils/ChangeLog5
-rw-r--r--Build/source/texk/psutils/Makefile.am10
-rw-r--r--Build/source/texk/psutils/Makefile.in16
-rw-r--r--Build/source/texk/psutils/ac/withenable.ac4
-rw-r--r--Build/source/texk/psutils/aclocal.m42
-rwxr-xr-xBuild/source/texk/psutils/configure71
-rw-r--r--Build/source/texk/psutils/configure.ac4
7 files changed, 59 insertions, 53 deletions
diff --git a/Build/source/texk/psutils/ChangeLog b/Build/source/texk/psutils/ChangeLog
index 0d8c6f3dc89..b740adc8e0b 100644
--- a/Build/source/texk/psutils/ChangeLog
+++ b/Build/source/texk/psutils/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-13 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am, /ac/withenable.ac, configure.ac:
+ Replace libs/paper => libs/libpaper.
+
2013-12-25 Peter Breitenlohner <peb@mppmu.mpg.de>
* psutils.test (psresize): Test for '-0.000000' also at start.
diff --git a/Build/source/texk/psutils/Makefile.am b/Build/source/texk/psutils/Makefile.am
index 7d174c450a0..b190eadcea0 100644
--- a/Build/source/texk/psutils/Makefile.am
+++ b/Build/source/texk/psutils/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/psutils/
##
-## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
## We want to re-distribute the whole original psutils source tree.
@@ -12,7 +12,7 @@ EXTRA_DIST += $(PSUTILS_TREE)-PATCHES
dist-hook:
rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
-AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(PAPER_INCLUDES) -D_Noreturn= -D_GL_ATTRIBUTE_CONST=
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(LIBPAPER_INCLUDES) -D_Noreturn= -D_GL_ATTRIBUTE_CONST=
AM_CFLAGS = $(WARNING_CFLAGS)
noinst_LIBRARIES = libpsutils.a
@@ -23,7 +23,7 @@ libpsutils_a_SOURCES = \
@PSUTILS_TREE@/psutil.c \
@PSUTILS_TREE@/psutil.h
-$(libpsutils_a_OBJECTS): $(KPATHSEA_DEPEND) $(PAPER_DEPEND)
+$(libpsutils_a_OBJECTS): $(KPATHSEA_DEPEND) $(LIBPAPER_DEPEND)
bin_PROGRAMS = epsffit psbook psnup psresize psselect pstops
@@ -39,7 +39,7 @@ psselect_SOURCES = @PSUTILS_TREE@/psselect.c
pstops_SOURCES = @PSUTILS_TREE@/pstops.c
-LDADD = libpsutils.a $(KPATHSEA_LIBS) $(PAPER_LIBS)
+LDADD = libpsutils.a $(KPATHSEA_LIBS) $(LIBPAPER_LIBS)
perl_scripts = \
extractres \
@@ -73,7 +73,7 @@ man1_MANS = \
## Rebuild libkpathsea
@KPATHSEA_RULE@
## Rebuild libpaper
-@PAPER_RULE@
+@LIBPAPER_RULE@
## Tests
##
diff --git a/Build/source/texk/psutils/Makefile.in b/Build/source/texk/psutils/Makefile.in
index d1be582b3d6..5f75d25249a 100644
--- a/Build/source/texk/psutils/Makefile.in
+++ b/Build/source/texk/psutils/Makefile.in
@@ -105,7 +105,7 @@ subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
- $(top_srcdir)/../../m4/kpse-paper-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-libpaper-flags.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/../../m4/kpse-win32.m4 \
$(top_srcdir)/../../m4/libtool.m4 \
@@ -499,6 +499,9 @@ KPATHSEA_LIBS = @KPATHSEA_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
+LIBPAPER_DEPEND = @LIBPAPER_DEPEND@
+LIBPAPER_INCLUDES = @LIBPAPER_INCLUDES@
+LIBPAPER_LIBS = @LIBPAPER_LIBS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
@@ -521,9 +524,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PAPER_DEPEND = @PAPER_DEPEND@
-PAPER_INCLUDES = @PAPER_INCLUDES@
-PAPER_LIBS = @PAPER_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PSUTILS_TREE = @PSUTILS_TREE@
RANLIB = @RANLIB@
@@ -591,7 +591,7 @@ EXTRA_DIST = $(PSUTILS_TREE) $(PSUTILS_TREE)-PATCHES \
tests/playps.2 tests/playres.ps tests/playsel.2 \
tests/playsel1.2 tests/plot.eps tests/ploth.eps \
tests/plotm.eps tests/plotv.eps
-AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(PAPER_INCLUDES) -D_Noreturn= -D_GL_ATTRIBUTE_CONST=
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(LIBPAPER_INCLUDES) -D_Noreturn= -D_GL_ATTRIBUTE_CONST=
AM_CFLAGS = $(WARNING_CFLAGS)
noinst_LIBRARIES = libpsutils.a
libpsutils_a_SOURCES = \
@@ -606,7 +606,7 @@ psnup_SOURCES = @PSUTILS_TREE@/psnup.c
psresize_SOURCES = @PSUTILS_TREE@/psresize.c
psselect_SOURCES = @PSUTILS_TREE@/psselect.c
pstops_SOURCES = @PSUTILS_TREE@/pstops.c
-LDADD = libpsutils.a $(KPATHSEA_LIBS) $(PAPER_LIBS)
+LDADD = libpsutils.a $(KPATHSEA_LIBS) $(LIBPAPER_LIBS)
perl_scripts = \
extractres \
includeres \
@@ -1486,7 +1486,7 @@ uninstall-man: uninstall-man1
dist-hook:
rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
-$(libpsutils_a_OBJECTS): $(KPATHSEA_DEPEND) $(PAPER_DEPEND)
+$(libpsutils_a_OBJECTS): $(KPATHSEA_DEPEND) $(LIBPAPER_DEPEND)
.PHONY: install-lua-links install-perl-links install-shell-links install-sh-links \
install-links uninstall-links
@WIN32_TRUE@@WIN32_WRAP_TRUE@$(wrappers): $(runscript)
@@ -1535,7 +1535,7 @@ install-data-hook: install-perl-links
uninstall-hook: uninstall-links
@KPATHSEA_RULE@
-@PAPER_RULE@
+@LIBPAPER_RULE@
# 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/texk/psutils/ac/withenable.ac b/Build/source/texk/psutils/ac/withenable.ac
index 057dc856a0b..eac99ec8435 100644
--- a/Build/source/texk/psutils/ac/withenable.ac
+++ b/Build/source/texk/psutils/ac/withenable.ac
@@ -1,7 +1,7 @@
## texk/psutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/psutils/
dnl
-dnl Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009-2014 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 psutils
-KPSE_ENABLE_PROG([psutils], [kpathsea paper])
+KPSE_ENABLE_PROG([psutils], [kpathsea libpaper])
diff --git a/Build/source/texk/psutils/aclocal.m4 b/Build/source/texk/psutils/aclocal.m4
index 1e7423053a1..dd72793fc1b 100644
--- a/Build/source/texk/psutils/aclocal.m4
+++ b/Build/source/texk/psutils/aclocal.m4
@@ -1185,7 +1185,7 @@ AC_SUBST([am__untar])
m4_include([../../m4/kpse-common.m4])
m4_include([../../m4/kpse-kpathsea-flags.m4])
-m4_include([../../m4/kpse-paper-flags.m4])
+m4_include([../../m4/kpse-libpaper-flags.m4])
m4_include([../../m4/kpse-warnings.m4])
m4_include([../../m4/kpse-win32.m4])
m4_include([../../m4/libtool.m4])
diff --git a/Build/source/texk/psutils/configure b/Build/source/texk/psutils/configure
index ee3fb8401f7..a0d89371a7c 100755
--- a/Build/source/texk/psutils/configure
+++ b/Build/source/texk/psutils/configure
@@ -641,10 +641,10 @@ WIN32_WRAP_FALSE
WIN32_WRAP_TRUE
WIN32_FALSE
WIN32_TRUE
-PAPER_RULE
-PAPER_DEPEND
-PAPER_LIBS
-PAPER_INCLUDES
+LIBPAPER_RULE
+LIBPAPER_DEPEND
+LIBPAPER_LIBS
+LIBPAPER_INCLUDES
KPATHSEA_RULE
KPATHSEA_DEPEND
KPATHSEA_LIBS
@@ -784,9 +784,9 @@ enable_largefile
with_system_kpathsea
with_kpathsea_includes
with_kpathsea_libdir
-with_system_paper
-with_paper_includes
-with_paper_libdir
+with_system_libpaper
+with_libpaper_includes
+with_libpaper_libdir
'
ac_precious_vars='build_alias
host_alias
@@ -1448,10 +1448,11 @@ Optional Packages:
kpathsea headers installed in DIR
--with-kpathsea-libdir=DIR
kpathsea library installed in DIR
- --with-system-paper use installed paper headers and library
- --with-paper-includes=DIR
- paper headers installed in DIR
- --with-paper-libdir=DIR paper library installed in DIR
+ --with-system-libpaper use installed libpaper headers and library
+ --with-libpaper-includes=DIR
+ libpaper headers installed in DIR
+ --with-libpaper-libdir=DIR
+ libpaper library installed in DIR
Some influential environment variables:
CC C compiler command
@@ -14393,39 +14394,39 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG"
fi
-## _KPSE_LIB_FLAGS: Setup paper (-lpaper) flags
+## _KPSE_LIB_FLAGS: Setup libpaper (-lpaper) flags
-# Check whether --with-system-paper was given.
-if test "${with_system_paper+set}" = set; then :
- withval=$with_system_paper;
+# Check whether --with-system-libpaper was given.
+if test "${with_system_libpaper+set}" = set; then :
+ withval=$with_system_libpaper;
fi
-# Check whether --with-paper-includes was given.
-if test "${with_paper_includes+set}" = set; then :
- withval=$with_paper_includes;
+# Check whether --with-libpaper-includes was given.
+if test "${with_libpaper_includes+set}" = set; then :
+ withval=$with_libpaper_includes;
fi
-# Check whether --with-paper-libdir was given.
-if test "${with_paper_libdir+set}" = set; then :
- withval=$with_paper_libdir;
+# Check whether --with-libpaper-libdir was given.
+if test "${with_libpaper_libdir+set}" = set; then :
+ withval=$with_libpaper_libdir;
fi
-if test "x$with_system_paper" = xyes; then
- if test "x$with_paper_includes" != x && test "x$with_paper_includes" != xyes; then
- PAPER_INCLUDES="-I$with_paper_includes"
+if test "x$with_system_libpaper" = xyes; then
+ if test "x$with_libpaper_includes" != x && test "x$with_libpaper_includes" != xyes; then
+ LIBPAPER_INCLUDES="-I$with_libpaper_includes"
fi
-PAPER_LIBS="-lpaper"
-if test "x$with_paper_libdir" != x && test "x$with_paper_libdir" != xyes; then
- PAPER_LIBS="-L$with_paper_libdir $PAPER_LIBS"
+LIBPAPER_LIBS="-lpaper"
+if test "x$with_libpaper_libdir" != x && test "x$with_libpaper_libdir" != xyes; then
+ LIBPAPER_LIBS="-L$with_libpaper_libdir $LIBPAPER_LIBS"
fi
else
- PAPER_INCLUDES="-I$kpse_BLD/libs/paper/include"
- PAPER_LIBS="$kpse_BLD/libs/paper/libpaper.a"
- PAPER_DEPEND='${top_builddir}/../../libs/paper/libpaper.a'
- PAPER_RULE='# Rebuild libpaper
-$(PAPER_DEPEND): ${top_builddir}/../../libs/paper/include/paper.h
- cd ${top_builddir}/../../libs/paper && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/paper/include/paper.h:
- cd ${top_builddir}/../../libs/paper && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+ LIBPAPER_INCLUDES="-I$kpse_BLD/libs/libpaper/include"
+ LIBPAPER_LIBS="$kpse_BLD/libs/libpaper/libpaper.a"
+ LIBPAPER_DEPEND='${top_builddir}/../../libs/libpaper/libpaper.a'
+ LIBPAPER_RULE='# Rebuild libpaper
+$(LIBPAPER_DEPEND): ${top_builddir}/../../libs/libpaper/include/paper.h
+ cd ${top_builddir}/../../libs/libpaper && $(MAKE) $(AM_MAKEFLAGS) rebuild
+${top_builddir}/../../libs/libpaper/include/paper.h:
+ cd ${top_builddir}/../../libs/libpaper && $(MAKE) $(AM_MAKEFLAGS) rebuild'
fi
diff --git a/Build/source/texk/psutils/configure.ac b/Build/source/texk/psutils/configure.ac
index 561c6834591..0e493ca683d 100644
--- a/Build/source/texk/psutils/configure.ac
+++ b/Build/source/texk/psutils/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
dnl
dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ AC_CONFIG_HEADERS([config.h])
AH_BOTTOM([#include <kpathsea/getopt.h>])
KPSE_KPATHSEA_FLAGS
-KPSE_PAPER_FLAGS
+KPSE_LIBPAPER_FLAGS
KPSE_COND_WIN32_WRAP