walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[git.mk] Update

This commit is contained in:
Behdad Esfahbod 2013-08-26 17:58:25 -04:00
parent 700a15fe4b
commit dddf990c36
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
git.mk
View File

@ -77,7 +77,7 @@ GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \
$(srcdir)/aclocal.m4 \ $(srcdir)/aclocal.m4 \
$(srcdir)/autoscan.log \ $(srcdir)/autoscan.log \
$(srcdir)/configure.scan \ $(srcdir)/configure.scan \
`AUX_DIR=$(srcdir)/$$($(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1' $(srcdir)/configure.ac); \ `AUX_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1' ./configure.ac); \
test "x$$AUX_DIR" = "x$(srcdir)/" && AUX_DIR=$(srcdir); \ test "x$$AUX_DIR" = "x$(srcdir)/" && AUX_DIR=$(srcdir); \
for x in \ for x in \
ar-lib \ ar-lib \
@ -90,13 +90,13 @@ GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \
missing \ missing \
mkinstalldirs \ mkinstalldirs \
; do echo "$$AUX_DIR/$$x"; done` \ ; do echo "$$AUX_DIR/$$x"; done` \
`$(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' $(srcdir)/configure.ac | \ `cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' ./configure.ac | \
head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done` head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done`
# #
# All modules should also be fine including the following variable, which # All modules should also be fine including the following variable, which
# removes automake-generated Makefile.in files: # removes automake-generated Makefile.in files:
GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN = \ GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN = \
`$(AUTOCONF) --trace 'AC_CONFIG_FILES:$$1' $(srcdir)/configure.ac | \ `cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_FILES:$$1' ./configure.ac | \
while read f; do \ while read f; do \
case $$f in Makefile|*/Makefile) \ case $$f in Makefile|*/Makefile) \
test -f "$(srcdir)/$$f.am" && echo "$(srcdir)/$$f.in";; esac; \ test -f "$(srcdir)/$$f.am" && echo "$(srcdir)/$$f.in";; esac; \
@ -160,6 +160,8 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
"tmpl/*.bak" \ "tmpl/*.bak" \
xml html \ xml html \
; do echo "/$$x"; done; \ ; do echo "/$$x"; done; \
FLAVOR=$$(cd $(top_srcdir); $(AUTOCONF) --trace 'GTK_DOC_CHECK:$$2' ./configure.ac); \
case $$FLAVOR in *no-tmpl*) echo /tmpl;; esac; \
fi; \ fi; \
if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \ if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
for lc in $(DOC_LINGUAS); do \ for lc in $(DOC_LINGUAS); do \
@ -235,7 +237,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
if test "x$(am__dirstamp)" = x; then :; else \ if test "x$(am__dirstamp)" = x; then :; else \
echo "$(am__dirstamp)"; \ echo "$(am__dirstamp)"; \
fi; \ fi; \
if test "x$(LTCOMPILE)" = x; then :; else \ if test "x$(LTCOMPILE)" = x -a "x$(GTKDOC_RUN)" = x; then :; else \
for x in \ for x in \
"*.lo" \ "*.lo" \
".libs" "_libs" \ ".libs" "_libs" \
@ -250,6 +252,9 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
$(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \ $(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \
so_locations \ so_locations \
$(MOSTLYCLEANFILES) \ $(MOSTLYCLEANFILES) \
$(TEST_LOGS) \
$(TEST_LOGS:.log=.trs) \
$(TEST_SUITE_LOG) \
"*.$(OBJEXT)" \ "*.$(OBJEXT)" \
$(DISTCLEANFILES) \ $(DISTCLEANFILES) \
$(am__CONFIG_DISTCLEAN_FILES) \ $(am__CONFIG_DISTCLEAN_FILES) \
@ -259,6 +264,10 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
$(MAINTAINERCLEANFILES) \ $(MAINTAINERCLEANFILES) \
$(BUILT_SOURCES) \ $(BUILT_SOURCES) \
$(DEPDIR) \ $(DEPDIR) \
$(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \
$(filter %_vala.stamp,$(DIST_COMMON)) \
$(filter %.vapi,$(DIST_COMMON)) \
$(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))) \
Makefile \ Makefile \
Makefile.in \ Makefile.in \
"*.orig" \ "*.orig" \