Makefile.am | 22 +++----------------- git.mk | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- src/Makefile.am | 2 + 3 files changed, 62 insertions(+), 21 deletions(-)
New commits: commit cd54d505d1a2467a67e5ff96fe0eb101b953b265 Author: Behdad Esfahbod <[email protected]> Date: Mon Mar 4 21:29:38 2013 -0500 Fix distcheck diff --git a/src/Makefile.am b/src/Makefile.am index 269fabe..342a3fb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,6 +20,8 @@ HBLIBS = HBSOURCES = \ hb-atomic-private.hh \ hb-blob.cc \ + hb-buffer-deserialize-json.hh \ + hb-buffer-deserialize-text.hh \ hb-buffer-private.hh \ hb-buffer-serialize.cc \ hb-buffer.cc \ commit 22c625a490bbaac52ead2cd29ee49b170e6e9845 Author: Behdad Esfahbod <[email protected]> Date: Mon Mar 4 20:56:15 2013 -0500 [git.mk] Update to commit efc928222179576270c5910416d8055dd7a97896 Move reusable list of files into variable definitions modules can reuse diff --git a/Makefile.am b/Makefile.am index e63bc54..19c2095 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,26 +16,12 @@ EXTRA_DIST = \ $(NULL) MAINTAINERCLEANFILES = \ + $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \ + $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \ + $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \ $(srcdir)/INSTALL \ - $(srcdir)/aclocal.m4 \ - $(srcdir)/autoscan.log \ - $(srcdir)/compile \ - $(srcdir)/config.guess \ - $(srcdir)/config.h.in \ - $(srcdir)/config.sub \ - $(srcdir)/configure.scan \ - $(srcdir)/depcomp \ - $(srcdir)/install-sh \ - $(srcdir)/ltmain.sh \ - $(srcdir)/missing \ - $(srcdir)/mkinstalldirs \ $(srcdir)/ChangeLog \ - $(srcdir)/m4/libtool.m4 \ - $(srcdir)/m4/ltoptions.m4 \ - $(srcdir)/m4/ltsugar.m4 \ - $(srcdir)/m4/ltversion.m4 \ - $(srcdir)/m4/lt~obsolete.m4 \ - `find "$(srcdir)" -type f -name Makefile.in -print` + $(NULL) # diff --git a/git.mk b/git.mk index 4da8fe2..cdc7d51 100644 --- a/git.mk +++ b/git.mk @@ -1,14 +1,17 @@ # git.mk # # Copyright 2009, Red Hat, Inc. -# Copyright 2010,2011 Behdad Esfahbod +# Copyright 2010,2011,2012,2013 Behdad Esfahbod # Written by Behdad Esfahbod # # Copying and distribution of this file, with or without modification, # is permitted in any medium without royalty provided the copyright # notice and this notice are preserved. # -# The canonical source for this file is https://github.com/behdad/git.mk. +# The latest version of this file can be downloaded from: +# https://raw.github.com/behdad/git.mk/master/git.mk +# Bugs, etc, should be reported upstream at: +# https://github.com/behdad/git.mk # # To use in your project, import this file in your git repo's toplevel, # then do "make -f git.mk". This modifies all Makefile.am files in @@ -61,6 +64,53 @@ # example. # + + +############################################################################### +# Variables user modules may want to add to toplevel MAINTAINERCLEANFILES: +############################################################################### + +# +# Most autotools-using modules should be fine including this variable in their +# toplevel MAINTAINERCLEANFILES: +GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \ + $(srcdir)/aclocal.m4 \ + $(srcdir)/autoscan.log \ + $(srcdir)/compile \ + $(srcdir)/config.guess \ + $(srcdir)/config.h.in \ + $(srcdir)/config.sub \ + $(srcdir)/configure.scan \ + $(srcdir)/depcomp \ + $(srcdir)/install-sh \ + $(srcdir)/ltmain.sh \ + $(srcdir)/missing \ + $(srcdir)/mkinstalldirs +# +# All modules should also be fine including the following variable, which +# removes automake-generated Makefile.in files: +GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN = \ + `$(AUTOCONF) --trace 'AC_CONFIG_FILES:$$1' $(srcdir)/configure.ac | \ + while read f; do \ + case $$f in Makefile|*/Makefile) \ + test -f "$(srcdir)/$$f.am" && echo "$(srcdir)/$$f.in";; esac; \ + done` +# +# Modules that use libtool /and/ use AC_CONFIG_MACRO_DIR([m4]) may also +# include this: +GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL = \ + $(srcdir)/m4/libtool.m4 \ + $(srcdir)/m4/ltoptions.m4 \ + $(srcdir)/m4/ltsugar.m4 \ + $(srcdir)/m4/ltversion.m4 \ + $(srcdir)/m4/lt~obsolete.m4 + + + +############################################################################### +# Default rule is to install ourselves in all Makefile.am files: +############################################################################### + git-all: git-mk-install git-mk-install: @@ -88,7 +138,10 @@ git-mk-install: .PHONY: git-all git-mk-install -### .gitignore generation + +############################################################################### +# Actual .gitignore generation: +############################################################################### $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk $(AM_V_GEN) \ _______________________________________________ HarfBuzz mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/harfbuzz
