From 0428e986f06209f75419776b630d34e93080d57a Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Wed, 30 Jan 2013 09:41:34 +0000 Subject: build system: Allow subdir-objects as required for Automake 1.14 git-svn-id: svn://tug.org/texlive/trunk@28989 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/xindy/ChangeLog | 4 ++++ Build/source/utils/xindy/configure | 4 +++- Build/source/utils/xindy/configure.ac | 7 ++----- Build/source/utils/xindy/xindy-2.4/tex2xindy/Makefile.in | 14 ++++++++------ 4 files changed, 17 insertions(+), 12 deletions(-) (limited to 'Build/source/utils/xindy') diff --git a/Build/source/utils/xindy/ChangeLog b/Build/source/utils/xindy/ChangeLog index 1dd3c4fa83b..075377452fa 100644 --- a/Build/source/utils/xindy/ChangeLog +++ b/Build/source/utils/xindy/ChangeLog @@ -1,3 +1,7 @@ +2013-01-30 Peter Breitenlohner + + * configure.ac: Use KPSE_COND_WIN32_WRAP for win32 wrappers. + 2012-12-17 Peter Breitenlohner * configure.ac: Use KPSE_BASIC to enable silent rules. diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure index 51f11198df6..c19c207ec30 100755 --- a/Build/source/utils/xindy/configure +++ b/Build/source/utils/xindy/configure @@ -4949,7 +4949,8 @@ else WIN32_FALSE= fi - if test -r $srcdir/../../texk/texlive/w32_wrapper/runscript.exe; then + + if test -r "$srcdir/../../texk/texlive/w32_wrapper/runscript.exe"; then WIN32_WRAP_TRUE= WIN32_WRAP_FALSE='#' else @@ -4958,6 +4959,7 @@ else fi + XINDY_TREE=xindy-2.4 diff --git a/Build/source/utils/xindy/configure.ac b/Build/source/utils/xindy/configure.ac index c52a5f9aad1..74ec66d72b7 100644 --- a/Build/source/utils/xindy/configure.ac +++ b/Build/source/utils/xindy/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2009-2012 Peter Breitenlohner +dnl Copyright (C) 2009-2013 Peter Breitenlohner dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -126,10 +126,7 @@ AC_CHECK_FUNCS([strtoul], [], echo timestamp >config.force fi -KPSE_CHECK_WIN32 -AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno]) -AM_CONDITIONAL([WIN32_WRAP], - [test -r $srcdir/../../texk/texlive/w32_wrapper/runscript.exe]) +KPSE_COND_WIN32_WRAP AC_SUBST([XINDY_TREE], [xindy-]xindy_version) diff --git a/Build/source/utils/xindy/xindy-2.4/tex2xindy/Makefile.in b/Build/source/utils/xindy/xindy-2.4/tex2xindy/Makefile.in index 7ae4037d33f..bef21a0dbf7 100644 --- a/Build/source/utils/xindy/xindy-2.4/tex2xindy/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.4/tex2xindy/Makefile.in @@ -363,18 +363,20 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tex2xindy.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) '$<'` .l.c: $(AM_V_LEX)$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE) -- cgit v1.2.3