summaryrefslogtreecommitdiff
path: root/Build/source/texk/lacheck
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/lacheck')
-rw-r--r--Build/source/texk/lacheck/ChangeLog4
-rw-r--r--Build/source/texk/lacheck/Makefile.am8
-rw-r--r--Build/source/texk/lacheck/Makefile.in56
-rwxr-xr-xBuild/source/texk/lacheck/configure4
-rw-r--r--Build/source/texk/lacheck/configure.ac5
-rw-r--r--Build/source/texk/lacheck/lacheck-1.26-PATCHES/TL-Changes2
-rw-r--r--Build/source/texk/lacheck/lacheck-1.26/lacheck.c (renamed from Build/source/texk/lacheck/lacheck.c)0
7 files changed, 48 insertions, 31 deletions
diff --git a/Build/source/texk/lacheck/ChangeLog b/Build/source/texk/lacheck/ChangeLog
index 66411a56bca..3dbb8a3fe1a 100644
--- a/Build/source/texk/lacheck/ChangeLog
+++ b/Build/source/texk/lacheck/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am, configure.ac: Allow subdir-objects.
+
2012-12-17 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Enable silent rules.
diff --git a/Build/source/texk/lacheck/Makefile.am b/Build/source/texk/lacheck/Makefile.am
index ea95f23b66b..fc3d07a1907 100644
--- a/Build/source/texk/lacheck/Makefile.am
+++ b/Build/source/texk/lacheck/Makefile.am
@@ -1,12 +1,10 @@
## Makefile.am for the TeX Live subdirectory texk/lacheck/
##
-## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
-LACHECK_TREE = lacheck-$(REV)
-
## We want to re-distribute the whole original lacheck source tree.
EXTRA_DIST = $(LACHECK_TREE)
## Patches applied to the original source tree
@@ -14,13 +12,13 @@ EXTRA_DIST += $(LACHECK_TREE)-PATCHES
# in case of an SVN repository
dist-hook:
- rm -rf `find $(distdir) -name .svn`
+ rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = lacheck
-lacheck_SOURCES = $(LACHECK_TREE)/lacheck.l
+lacheck_SOURCES = @LACHECK_TREE@/lacheck.l
nodist_man1_MANS = lacheck.1
diff --git a/Build/source/texk/lacheck/Makefile.in b/Build/source/texk/lacheck/Makefile.in
index 0b9c5dbcd5b..de1c8aab896 100644
--- a/Build/source/texk/lacheck/Makefile.in
+++ b/Build/source/texk/lacheck/Makefile.in
@@ -54,8 +54,8 @@ bin_PROGRAMS = lacheck$(EXEEXT)
subdir = .
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
- $(srcdir)/config.h.in lacheck.c $(dist_check_SCRIPTS) \
- $(top_srcdir)/../../build-aux/depcomp \
+ $(srcdir)/config.h.in @LACHECK_TREE@/lacheck.c \
+ $(dist_check_SCRIPTS) $(top_srcdir)/../../build-aux/depcomp \
$(top_srcdir)/../../build-aux/ylwrap \
$(top_srcdir)/../../build-aux/test-driver ChangeLog \
../../build-aux/config.guess ../../build-aux/config.sub \
@@ -86,7 +86,8 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
PROGRAMS = $(bin_PROGRAMS)
-am_lacheck_OBJECTS = lacheck.$(OBJEXT)
+am__dirstamp = $(am__leading_dot)dirstamp
+am_lacheck_OBJECTS = @LACHECK_TREE@/lacheck.$(OBJEXT)
lacheck_OBJECTS = $(am_lacheck_OBJECTS)
lacheck_LDADD = $(LDADD)
AM_V_lt = $(am__v_lt_@AM_V@)
@@ -418,6 +419,7 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LACHECK_TREE = @LACHECK_TREE@
LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
@@ -508,10 +510,9 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
-LACHECK_TREE = lacheck-$(REV)
EXTRA_DIST = $(LACHECK_TREE) $(LACHECK_TREE)-PATCHES
AM_CFLAGS = $(WARNING_CFLAGS)
-lacheck_SOURCES = $(LACHECK_TREE)/lacheck.l
+lacheck_SOURCES = @LACHECK_TREE@/lacheck.l
nodist_man1_MANS = lacheck.1
CLEANFILES = lacheck.1 test.out
dist_check_SCRIPTS = lacheck.test
@@ -620,35 +621,47 @@ clean-binPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
+@LACHECK_TREE@/$(am__dirstamp):
+ @$(MKDIR_P) @LACHECK_TREE@
+ @: > @LACHECK_TREE@/$(am__dirstamp)
+@LACHECK_TREE@/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) @LACHECK_TREE@/$(DEPDIR)
+ @: > @LACHECK_TREE@/$(DEPDIR)/$(am__dirstamp)
+@LACHECK_TREE@/lacheck.$(OBJEXT): @LACHECK_TREE@/$(am__dirstamp) \
+ @LACHECK_TREE@/$(DEPDIR)/$(am__dirstamp)
lacheck$(EXEEXT): $(lacheck_OBJECTS) $(lacheck_DEPENDENCIES) $(EXTRA_lacheck_DEPENDENCIES)
@rm -f lacheck$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(lacheck_OBJECTS) $(lacheck_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
+ -rm -f @LACHECK_TREE@/*.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lacheck.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LACHECK_TREE@/$(DEPDIR)/lacheck.Po@am__quote@
.c.o:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -656,11 +669,6 @@ distclean-compile:
.l.c:
$(AM_V_LEX)$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
-lacheck.c: $(LACHECK_TREE)/lacheck.l
- $(AM_V_LEX) \
- $(am__skiplex) \
- $(SHELL) $(YLWRAP) `test -f '$(LACHECK_TREE)/lacheck.l' || echo '$(srcdir)/'`$(LACHECK_TREE)/lacheck.l $(LEX_OUTPUT_ROOT).c lacheck.c -- $(LEX) $(AM_LFLAGS) $(LFLAGS)
-
mostlyclean-libtool:
-rm -f *.lo
@@ -1124,18 +1132,20 @@ 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)
+ -rm -f @LACHECK_TREE@/$(DEPDIR)/$(am__dirstamp)
+ -rm -f @LACHECK_TREE@/$(am__dirstamp)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
- -rm -f lacheck.c
+ -rm -f @LACHECK_TREE@/lacheck.c
clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf ./$(DEPDIR)
+ -rm -rf @LACHECK_TREE@/$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-libtool distclean-tags
@@ -1183,7 +1193,7 @@ installcheck-am:
maintainer-clean: maintainer-clean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
- -rm -rf ./$(DEPDIR)
+ -rm -rf @LACHECK_TREE@/$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -1228,7 +1238,7 @@ uninstall-man: uninstall-man1
# in case of an SVN repository
dist-hook:
- rm -rf `find $(distdir) -name .svn`
+ rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
lacheck.1: $(LACHECK_TREE)/lacheck.man
$(AM_V_GEN)sed -e "s!%%LACHECKREV%%!Release $(REV)!" \
diff --git a/Build/source/texk/lacheck/configure b/Build/source/texk/lacheck/configure
index 865f4de4c52..4ba996c1cf1 100755
--- a/Build/source/texk/lacheck/configure
+++ b/Build/source/texk/lacheck/configure
@@ -718,6 +718,7 @@ am__isrc
INSTALL_DATA
INSTALL_SCRIPT
INSTALL_PROGRAM
+LACHECK_TREE
REV
target_alias
host_alias
@@ -2497,6 +2498,9 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
REV='1.26'
+REV=1.26
+
+LACHECK_TREE=lacheck-1.26
am__api_version='1.13'
diff --git a/Build/source/texk/lacheck/configure.ac b/Build/source/texk/lacheck/configure.ac
index 64f92008001..f08da2ea02a 100644
--- a/Build/source/texk/lacheck/configure.ac
+++ b/Build/source/texk/lacheck/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009-2013 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,
@@ -14,7 +14,8 @@ AC_CONFIG_AUX_DIR([../../build-aux])
AC_CONFIG_MACRO_DIR([../../m4])
REV='lacheck_version'
-AC_SUBST([REV])
+AC_SUBST([REV], [lacheck_version])
+AC_SUBST([LACHECK_TREE], [lacheck-]lacheck_version)
dnl Common code for all programs using libkpathsea.
KPSE_COMMON([lacheck])
diff --git a/Build/source/texk/lacheck/lacheck-1.26-PATCHES/TL-Changes b/Build/source/texk/lacheck/lacheck-1.26-PATCHES/TL-Changes
index c7c52c5df80..a484b7a7280 100644
--- a/Build/source/texk/lacheck/lacheck-1.26-PATCHES/TL-Changes
+++ b/Build/source/texk/lacheck/lacheck-1.26-PATCHES/TL-Changes
@@ -4,6 +4,6 @@ Changes applied to the lacheck-1.26 tree as obtained from:
Renamed:
lacheck.lex -> lacheck.l
-Removed:
+Updated:
lacheck.c
diff --git a/Build/source/texk/lacheck/lacheck.c b/Build/source/texk/lacheck/lacheck-1.26/lacheck.c
index 6062205c51f..6062205c51f 100644
--- a/Build/source/texk/lacheck/lacheck.c
+++ b/Build/source/texk/lacheck/lacheck-1.26/lacheck.c