diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2013-12-03 16:22:02 -0500 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2013-12-15 18:42:46 -0500 |
| commit | 922e4973475db9420c8de9e3f634271738ce920f (patch) | |
| tree | 59d8bec0dcb20b361a5f3e940712d9ab5a3f18f4 | |
| parent | 10dc44e0bb9f974782ed6d01a7a65634d0921aee (diff) | |
| download | pango-922e4973475db9420c8de9e3f634271738ce920f.tar.gz | |
[git.mk] Update
| -rw-r--r-- | Makefile.am | 17 | ||||
| -rw-r--r-- | git.mk | 21 |
2 files changed, 16 insertions, 22 deletions
diff --git a/Makefile.am b/Makefile.am index 1ac018a3..9986f818 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,24 +35,13 @@ EXTRA_DIST = \ pango.doap MAINTAINERCLEANFILES = \ + $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \ + $(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)/omf.make \ $(srcdir)/xmldocs.make \ $(srcdir)/gtk-doc.make \ - $(srcdir)/ChangeLog \ - `find "$(srcdir)" -type f -name Makefile.in -print` + $(srcdir)/ChangeLog ### ChangeLog generation @@ -103,14 +103,19 @@ GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN = \ 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: +# Modules that use libtool and use AC_CONFIG_MACRO_DIR() may also include this, +# though it's harmless to include regardless. 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 + `MACRO_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_MACRO_DIR:$$1' ./configure.ac); \ + if test "x$$MACRO_DIR" != "x$(srcdir)/"; then \ + for x in \ + libtool.m4 \ + ltoptions.m4 \ + ltsugar.m4 \ + ltversion.m4 \ + lt~obsolete.m4 \ + ; do echo "$$MACRO_DIR/$$x"; done; \ + fi` @@ -268,7 +273,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk $(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \ $(filter %_vala.stamp,$(DIST_COMMON)) \ $(filter %.vapi,$(DIST_COMMON)) \ - $(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))) \ + $(filter %$(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))),$(DIST_COMMON)) \ Makefile \ Makefile.in \ "*.orig" \ |