diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-02-24 08:05:21 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-02-24 08:05:21 +0000 |
commit | e75c1ca802e8338ab6601788163bec9bb0591128 (patch) | |
tree | 0c82c700aca33a171763c921c9b5eac4d369eb01 /Build/source/libs/zziplib | |
parent | 6c7a45745172cf952ad650c99af32f22411cd454 (diff) |
build system: New Makefile fragment to `install' headers in the build tree.
git-svn-id: svn://tug.org/texlive/trunk@25493 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/zziplib')
-rw-r--r-- | Build/source/libs/zziplib/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/libs/zziplib/include/zzip/Makefile.am | 16 | ||||
-rw-r--r-- | Build/source/libs/zziplib/include/zzip/Makefile.in | 12 |
3 files changed, 14 insertions, 18 deletions
diff --git a/Build/source/libs/zziplib/ChangeLog b/Build/source/libs/zziplib/ChangeLog index aaa6e3f6cd7..e492ebc70c0 100644 --- a/Build/source/libs/zziplib/ChangeLog +++ b/Build/source/libs/zziplib/ChangeLog @@ -1,3 +1,7 @@ +2012-02-24 Peter Breitenlohner <peb@mppmu.mpg.de> + + * include/zzip/Makefile.am: Use ../am/hdr_links.am. + 2011-10-04 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am (DISTCLEANFILES): Add _configs.sed. diff --git a/Build/source/libs/zziplib/include/zzip/Makefile.am b/Build/source/libs/zziplib/include/zzip/Makefile.am index a1de19ed297..6d39938f291 100644 --- a/Build/source/libs/zziplib/include/zzip/Makefile.am +++ b/Build/source/libs/zziplib/include/zzip/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to install zziplib headers for TeX Live. ## -## Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2010-2012 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -8,7 +8,7 @@ ## ZZIPLIB_SRC = $(top_srcdir)/$(ZZIPLIB_TREE)/zzip -ZZIPLIB_HDRS = \ +hdr_links = \ $(ZZIPLIB_SRC)/autoconf.h \ $(ZZIPLIB_SRC)/conf.h \ $(ZZIPLIB_SRC)/fetch.h \ @@ -22,15 +22,5 @@ ZZIPLIB_HDRS = \ $(ZZIPLIB_SRC)/write.h \ $(ZZIPLIB_SRC)/zzip.h -all-local: - @for file in $(ZZIPLIB_HDRS); do \ - test -f $$file || continue; \ - inst=`echo $$file | sed -e 's/^.*\///'`; \ - test -f $$inst || { \ - echo "$(LN_S) $$file $$inst"; \ - $(LN_S) $$file $$inst; } || exit 1; \ - done - -distclean-local: - rm -f *.h +include $(top_srcdir)/../am/hdr_links.am diff --git a/Build/source/libs/zziplib/include/zzip/Makefile.in b/Build/source/libs/zziplib/include/zzip/Makefile.in index cfa199b1338..abfefc6627e 100644 --- a/Build/source/libs/zziplib/include/zzip/Makefile.in +++ b/Build/source/libs/zziplib/include/zzip/Makefile.in @@ -33,8 +33,9 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/../am/hdr_links.am subdir = include/zzip -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_sys_largefile_sensitive.m4 \ $(top_srcdir)/m4/ax_prefix_config_h.m4 \ @@ -156,7 +157,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ZZIPLIB_SRC = $(top_srcdir)/$(ZZIPLIB_TREE)/zzip -ZZIPLIB_HDRS = \ +hdr_links = \ $(ZZIPLIB_SRC)/autoconf.h \ $(ZZIPLIB_SRC)/conf.h \ $(ZZIPLIB_SRC)/fetch.h \ @@ -173,7 +174,7 @@ ZZIPLIB_HDRS = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.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*) \ @@ -194,6 +195,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_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -353,12 +355,12 @@ uninstall-am: maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am uninstall uninstall-am - all-local: - @for file in $(ZZIPLIB_HDRS); do \ + @for file in $(hdr_links); do \ test -f $$file || continue; \ inst=`echo $$file | sed -e 's/^.*\///'`; \ test -f $$inst || { \ + rm -f $$inst; \ echo "$(LN_S) $$file $$inst"; \ $(LN_S) $$file $$inst; } || exit 1; \ done |