diff options
Diffstat (limited to 'Build/source/libs/pixman')
-rw-r--r-- | Build/source/libs/pixman/ChangeLog | 12 | ||||
-rw-r--r-- | Build/source/libs/pixman/Makefile.am | 11 | ||||
-rw-r--r-- | Build/source/libs/pixman/Makefile.in | 41 | ||||
-rw-r--r-- | Build/source/libs/pixman/include/Makefile.am | 4 | ||||
-rw-r--r-- | Build/source/libs/pixman/include/Makefile.in | 8 |
5 files changed, 54 insertions, 22 deletions
diff --git a/Build/source/libs/pixman/ChangeLog b/Build/source/libs/pixman/ChangeLog index 3369a2670c0..3d8e6a95839 100644 --- a/Build/source/libs/pixman/ChangeLog +++ b/Build/source/libs/pixman/ChangeLog @@ -1,3 +1,11 @@ +2013-07-06 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Use ../am/rebuild.am. + +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * include/Makefile.am: Moved Makefile fragments to ../../am/. + 2013-06-26 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am (SUBDIRS): Build the library first. @@ -10,8 +18,8 @@ 2013-04-15 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am, configure.ac: Build non-libtool library. - * pixman.test: Shell script for a basic test. - * pixtest.c: Source code for test program. + * pixman.test (new): Shell script for a basic test. + * pixtest.c (new): Source code for test program. 2013-04-08 Mojca Miklavec <mojca.miklavec.lists@gmail.com> diff --git a/Build/source/libs/pixman/Makefile.am b/Build/source/libs/pixman/Makefile.am index 01bda177d82..45b9aceb549 100644 --- a/Build/source/libs/pixman/Makefile.am +++ b/Build/source/libs/pixman/Makefile.am @@ -8,10 +8,6 @@ ## ACLOCAL_AMFLAGS = -I ../../m4 -# Rebuild -.PHONY: rebuild -rebuild: all - ## We want to re-distribute the whole original pixman source tree. ## EXTRA_DIST = $(PIXMAN_TREE) @@ -49,5 +45,10 @@ pixtest_CPPFLAGS = -Iinclude LDADD = libpixman.a -## Files generated by TESTS +# Rebuild +rebuild_prereq = +rebuild_target = all +CLEANFILES = + +include $(srcdir)/../../am/rebuild.am diff --git a/Build/source/libs/pixman/Makefile.in b/Build/source/libs/pixman/Makefile.in index 2d71bdb5734..6e5fa0fbcd8 100644 --- a/Build/source/libs/pixman/Makefile.in +++ b/Build/source/libs/pixman/Makefile.in @@ -76,9 +76,10 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -DIST_COMMON = $(srcdir)/sources.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/configure \ - $(am__configure_deps) $(srcdir)/config.h.in \ +DIST_COMMON = $(srcdir)/sources.am $(srcdir)/../../am/rebuild.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in \ $(top_srcdir)/pixman-0.30.0/pixman/pixman-version.h.in \ $(am__dist_check_SCRIPTS_DIST) \ $(top_srcdir)/../../build-aux/depcomp \ @@ -622,6 +623,11 @@ libpixman_a_SOURCES = $(libpixman_sources) $(libpixman_headers) pixtest_SOURCES = pixtest.c pixtest_CPPFLAGS = -Iinclude LDADD = libpixman.a + +# Rebuild +rebuild_prereq = +rebuild_target = all +CLEANFILES = rebuild.stamp all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -629,7 +635,7 @@ all: config.h .SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/sources.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/sources.am $(srcdir)/../../am/rebuild.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -652,7 +658,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/sources.am: +$(srcdir)/sources.am $(srcdir)/../../am/rebuild.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -1345,6 +1351,7 @@ mostlyclean-generic: -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -1449,14 +1456,30 @@ uninstall-am: recheck tags tags-am uninstall uninstall-am -# Rebuild -.PHONY: rebuild -rebuild: all - # in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'` rm -f $(distdir)/$(PIXMAN_SRC)/pixman-version.h +rebuild.stamp: + echo timestamp >$@ + +.PHONY: rebuild +rebuild: $(rebuild_prereq) + @dry=; for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=*|--*);; \ + *n*) dry=:;; \ + esac; \ + done; \ + $$dry rm -f rebuild.stamp; \ + $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \ + if $$dry mkdir rebuild.lock 2>/dev/null; then \ + $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \ + $$dry rmdir rebuild.lock; \ + else \ + while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ + fi; \ + $$dry test -f rebuild.stamp # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Build/source/libs/pixman/include/Makefile.am b/Build/source/libs/pixman/include/Makefile.am index ad5c20dfb2d..8e64d9f2b75 100644 --- a/Build/source/libs/pixman/include/Makefile.am +++ b/Build/source/libs/pixman/include/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to install pixman headers for TeX Live. ## -## Copyright (C) 2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2012-2013 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -13,5 +13,5 @@ hdr_links = \ $(PIXMAN_SRC)/pixman.h \ $(PIXMAN_BLD)/pixman-version.h -include $(top_srcdir)/../am/hdr_links.am +include $(top_srcdir)/../../am/hdr_links.am diff --git a/Build/source/libs/pixman/include/Makefile.in b/Build/source/libs/pixman/include/Makefile.in index a0bc7ab7612..beec4251e1a 100644 --- a/Build/source/libs/pixman/include/Makefile.in +++ b/Build/source/libs/pixman/include/Makefile.in @@ -75,8 +75,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -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 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -214,7 +214,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*) \ @@ -235,7 +235,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 |