summaryrefslogtreecommitdiff
path: root/Build/source/texk/xdvik
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-09-09 10:07:08 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-09-09 10:07:08 +0000
commite981cdbd1662ed82436259f1046987c5b7204f1a (patch)
tree031a0f1bd753e2495237b10de7d1ff6fe5a1a909 /Build/source/texk/xdvik
parent3ad3db6624b55ad14658410f68ab6cb878904c7c (diff)
Various updates of build system: Use AC_CONFIG_MACRO_DIRS instead of ACLOCAL_AMFLAGS,
Factor recursion into subdirs into .am fragment and m4 macros, Avoid unnecessary use of Libtool, Use z_const git-svn-id: svn://tug.org/texlive/trunk@31606 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/xdvik')
-rw-r--r--Build/source/texk/xdvik/ChangeLog5
-rw-r--r--Build/source/texk/xdvik/Makefile.am2
-rw-r--r--Build/source/texk/xdvik/Makefile.in1
-rwxr-xr-xBuild/source/texk/xdvik/configure4
-rw-r--r--Build/source/texk/xdvik/configure.ac2
5 files changed, 8 insertions, 6 deletions
diff --git a/Build/source/texk/xdvik/ChangeLog b/Build/source/texk/xdvik/ChangeLog
index 574be1ef09d..180ec6456c3 100644
--- a/Build/source/texk/xdvik/ChangeLog
+++ b/Build/source/texk/xdvik/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-02 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Drop ACLOCAL_AMFLAGS.
+ * configure.ac: Use AC_CONFIG_MACRO_DIRS.
+
2013-07-02 Peter Breitenlohner <peb@mppmu.mpg.de>
* *.[ch], gui/*.[ch], tests/*.[ch]: Include "xdvi-config.h"
diff --git a/Build/source/texk/xdvik/Makefile.am b/Build/source/texk/xdvik/Makefile.am
index 99654a44206..f9e926e0d9f 100644
--- a/Build/source/texk/xdvik/Makefile.am
+++ b/Build/source/texk/xdvik/Makefile.am
@@ -3,8 +3,6 @@
## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
-ACLOCAL_AMFLAGS = -I ../../m4 -I m4
-
AM_CFLAGS = $(WARNING_CFLAGS)
SUBDIRS = squeeze . tests
diff --git a/Build/source/texk/xdvik/Makefile.in b/Build/source/texk/xdvik/Makefile.in
index 9b53ebba455..91c31625de8 100644
--- a/Build/source/texk/xdvik/Makefile.in
+++ b/Build/source/texk/xdvik/Makefile.in
@@ -493,7 +493,6 @@ x_linker_options = @x_linker_options@
x_tool_libs = @x_tool_libs@
x_xmu_lib = @x_xmu_lib@
x_xpm_libs = @x_xpm_libs@
-ACLOCAL_AMFLAGS = -I ../../m4 -I m4
AM_CFLAGS = $(WARNING_CFLAGS)
SUBDIRS = squeeze . tests
x_cppflags = $(X_CFLAGS) $(iconv_includes)
diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure
index ef148f28b72..b6cf8461c73 100755
--- a/Build/source/texk/xdvik/configure
+++ b/Build/source/texk/xdvik/configure
@@ -18347,8 +18347,8 @@ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
fi
else
FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2 -I$kpse_BLD/libs/freetype2"
- FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.la"
- FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.la'
+ FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a"
+ FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a'
FREETYPE2_RULE='# Rebuild libfreetype
$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h
cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
diff --git a/Build/source/texk/xdvik/configure.ac b/Build/source/texk/xdvik/configure.ac
index 7f416fa76aa..8ac60c71915 100644
--- a/Build/source/texk/xdvik/configure.ac
+++ b/Build/source/texk/xdvik/configure.ac
@@ -11,7 +11,7 @@ AC_INIT([xdvik (TeX Live)], xdvik_version, [tex-k@tug.org])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([xdvi.c])
AC_CONFIG_AUX_DIR([../../build-aux])
-AC_CONFIG_MACRO_DIR([../../m4])
+AC_CONFIG_MACRO_DIRS([../../m4 m4])
dnl Common code for all programs using libkpathsea.
KPSE_COMMON([xdvik])