From 832b5ce3848de5ca76c493570fc066f450ec8011 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Sat, 6 Jul 2013 09:40:06 +0000 Subject: build system: Move Makefile fragments from libs/am/ and texk/am/ to top-level/am. git-svn-id: svn://tug.org/texlive/trunk@31117 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/teckit/ChangeLog | 5 +++++ Build/source/libs/teckit/include/teckit/Makefile.am | 4 ++-- Build/source/libs/teckit/include/teckit/Makefile.in | 8 ++++---- 3 files changed, 11 insertions(+), 6 deletions(-) (limited to 'Build/source/libs/teckit') diff --git a/Build/source/libs/teckit/ChangeLog b/Build/source/libs/teckit/ChangeLog index af218ab1170..c2ca6e769a1 100644 --- a/Build/source/libs/teckit/ChangeLog +++ b/Build/source/libs/teckit/ChangeLog @@ -1,3 +1,8 @@ +2013-07-05 Peter Breitenlohner + + * include/teckit/Makefile.am: + Moved Makefile fragments to ../../am/. + 2013-06-26 Peter Breitenlohner * Makefile.am (SUBDIRS): Build the library first. diff --git a/Build/source/libs/teckit/include/teckit/Makefile.am b/Build/source/libs/teckit/include/teckit/Makefile.am index 072f9c4681b..1f7b333a68b 100644 --- a/Build/source/libs/teckit/include/teckit/Makefile.am +++ b/Build/source/libs/teckit/include/teckit/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to install TECkit headers for TeX Live. ## -## Copyright (C) 2009-2012 Peter Breitenlohner +## Copyright (C) 2009-2013 Peter Breitenlohner ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -13,5 +13,5 @@ hdr_links = \ $(TECKIT_SRC)/TECkit_Compiler.h \ $(TECKIT_SRC)/TECkit_Engine.h -include $(top_srcdir)/../am/hdr_links.am +include $(top_srcdir)/../../am/hdr_links.am diff --git a/Build/source/libs/teckit/include/teckit/Makefile.in b/Build/source/libs/teckit/include/teckit/Makefile.in index 1dc43f7c811..730e959c8ea 100644 --- a/Build/source/libs/teckit/include/teckit/Makefile.in +++ b/Build/source/libs/teckit/include/teckit/Makefile.in @@ -77,8 +77,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/../am/hdr_links.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am +DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = include/teckit ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -232,7 +232,7 @@ hdr_links = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/hdr_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/hdr_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -253,7 +253,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/../am/hdr_links.am: +$(top_srcdir)/../../am/hdr_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- cgit v1.2.3