[gtk+] Update git.mk, respects AC_CONFIG_AUX_DIR now
- From: Behdad Esfahbod <behdad src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Update git.mk, respects AC_CONFIG_AUX_DIR now
- Date: Thu, 11 Jul 2013 19:29:15 +0000 (UTC)
commit 0efeb96dab93f93e15137f5b16a0132e7c9f4369
Author: Behdad Esfahbod <behdad behdad org>
Date: Thu Jul 11 15:28:49 2013 -0400
Update git.mk, respects AC_CONFIG_AUX_DIR now
Makefile.am | 17 ++++-------------
git.mk | 23 +++++++++++++----------
2 files changed, 17 insertions(+), 23 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 509d504..4da3fd0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,24 +21,15 @@ EXTRA_DIST += \
po/po2tbl.sed.in
MAINTAINERCLEANFILES = \
+ $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
+ $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \
+ $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
$(srcdir)/INSTALL \
$(srcdir)/README \
- $(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)/omf.make \
$(srcdir)/xmldocs.make \
$(srcdir)/gtk-doc.make \
- $(srcdir)/ChangeLog \
- `find "$(srcdir)" -type f -name Makefile.in -print`
+ $(srcdir)/ChangeLog
## Copy .pc files to target-specific names
diff --git a/git.mk b/git.mk
index cd699b4..2a144a8 100644
--- a/git.mk
+++ b/git.mk
@@ -75,18 +75,21 @@
# toplevel MAINTAINERCLEANFILES:
GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \
$(srcdir)/aclocal.m4 \
- $(srcdir)/ar-lib \
$(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
+ `AUX_DIR=$(srcdir)/$$($(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1'); for x in \
+ ar-lib \
+ compile \
+ config.guess \
+ config.sub \
+ depcomp \
+ install-sh \
+ ltmain.sh \
+ missing \
+ mkinstalldirs \
+ ; do echo "$$AUX_DIR/$$x"; done` \
+ `$(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' $(srcdir)/configure.ac | \
+ head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done`
#
# All modules should also be fine including the following variable, which
# removes automake-generated Makefile.in files:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]