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-04-11 13:38:37 -04:00
parent ef9e02eddf
commit 36a661c0a0
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
git.mk
View File

@ -115,11 +115,11 @@ GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL = \
git-all: git-mk-install git-all: git-mk-install
git-mk-install: git-mk-install:
@echo Installing git makefile @echo "Installing git makefile"
@any_failed=; \ @any_failed=; \
find "`test -z "$(top_srcdir)" && echo . || echo "$(top_srcdir)"`" -name Makefile.am | while read x; do \ find "`test -z "$(top_srcdir)" && echo . || echo "$(top_srcdir)"`" -name Makefile.am | while read x; do \
if grep 'include .*/git.mk' $$x >/dev/null; then \ if grep 'include .*/git.mk' $$x >/dev/null; then \
echo $$x already includes git.mk; \ echo "$$x already includes git.mk"; \
else \ else \
failed=; \ failed=; \
echo "Updating $$x"; \ echo "Updating $$x"; \
@ -131,7 +131,7 @@ git-mk-install:
mv $$x.tmp $$x || failed=1; \ mv $$x.tmp $$x || failed=1; \
fi; \ fi; \
if test x$$failed = x; then : else \ if test x$$failed = x; then : else \
echo Failed updating $$x; >&2 \ echo "Failed updating $$x"; >&2 \
any_failed=1; \ any_failed=1; \
fi; \ fi; \
fi; done; test -z "$$any_failed" fi; done; test -z "$$any_failed"
@ -154,7 +154,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
tmpl/$(DOC_MODULE)-unused.sgml \ tmpl/$(DOC_MODULE)-unused.sgml \
"tmpl/*.bak" \ "tmpl/*.bak" \
xml html \ xml html \
; do echo /$$x; done; \ ; do echo "/$$x"; done; \
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 \
@ -162,7 +162,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
$(if $(DOC_MODULE),$(DOC_MODULE).xml) \ $(if $(DOC_MODULE),$(DOC_MODULE).xml) \
$(DOC_PAGES) \ $(DOC_PAGES) \
$(DOC_INCLUDES) \ $(DOC_INCLUDES) \
; do echo /$$lc/$$x; done; \ ; do echo "/$$lc/$$x"; done; \
done; \ done; \
for x in \ for x in \
$(_DOC_OMF_ALL) \ $(_DOC_OMF_ALL) \
@ -180,14 +180,14 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
$(HELP_FILES) \ $(HELP_FILES) \
"$$lc.stamp" \ "$$lc.stamp" \
"$$lc.mo" \ "$$lc.mo" \
; do echo /$$lc/$$x; done; \ ; do echo "/$$lc/$$x"; done; \
done; \ done; \
fi; \ fi; \
if test "x$(gsettings_SCHEMAS)" = x; then :; else \ if test "x$(gsettings_SCHEMAS)" = x; then :; else \
for x in \ for x in \
$(gsettings_SCHEMAS:.xml=.valid) \ $(gsettings_SCHEMAS:.xml=.valid) \
$(gsettings__enum_file) \ $(gsettings__enum_file) \
; do echo /$$x; done; \ ; do echo "/$$x"; done; \
fi; \ fi; \
if test -f $(srcdir)/po/Makefile.in.in; then \ if test -f $(srcdir)/po/Makefile.in.in; then \
for x in \ for x in \
@ -203,7 +203,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
intltool-extract.in \ intltool-extract.in \
intltool-merge.in \ intltool-merge.in \
intltool-update.in \ intltool-update.in \
; do echo /$$x; done; \ ; do echo "/$$x"; done; \
fi; \ fi; \
if test -f $(srcdir)/configure; then \ if test -f $(srcdir)/configure; then \
for x in \ for x in \
@ -213,14 +213,23 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
stamp-h1 \ stamp-h1 \
libtool \ libtool \
config.lt \ config.lt \
; do echo /$$x; done; \ ; do echo "/$$x"; done; \
fi; \ fi; \
if test "x$(DEJATOOL)" = x; then :; else \ if test "x$(DEJATOOL)" = x; then :; else \
for x in \ for x in \
$(DEJATOOL) \ $(DEJATOOL) \
; do echo /$$x.sum; echo /$$x.log; done; \ ; do echo "/$$x.sum"; echo "/$$x.log"; done; \
echo /site.exp; \ echo /site.exp; \
fi; \ fi; \
if test "x$(am__dirstamp)" = x; then :; else \
echo "$(am__dirstamp)"; \
fi; \
if test "x$(LTCOMPILE)" = x; then :; else \
for x in \
"*.lo" \
".libs" "_libs" \
; do echo "$$x"; done; \
fi; \
for x in \ for x in \
.gitignore \ .gitignore \
$(GITIGNOREFILES) \ $(GITIGNOREFILES) \
@ -229,10 +238,8 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
$(LIBRARIES) $(check_LIBRARIES) $(EXTRA_LIBRARIES) \ $(LIBRARIES) $(check_LIBRARIES) $(EXTRA_LIBRARIES) \
$(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \ $(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \
so_locations \ so_locations \
.libs _libs \
$(MOSTLYCLEANFILES) \ $(MOSTLYCLEANFILES) \
"*.$(OBJEXT)" \ "*.$(OBJEXT)" \
"*.lo" \
$(DISTCLEANFILES) \ $(DISTCLEANFILES) \
$(am__CONFIG_DISTCLEAN_FILES) \ $(am__CONFIG_DISTCLEAN_FILES) \
$(CONFIG_CLEAN_FILES) \ $(CONFIG_CLEAN_FILES) \
@ -249,7 +256,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
"*~" \ "*~" \
".*.sw[nop]" \ ".*.sw[nop]" \
".dirstamp" \ ".dirstamp" \
; do echo /$$x; done; \ ; do echo "/$$x"; done; \
} | \ } | \
sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \ sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
sed 's@/[.]/@/@g' | \ sed 's@/[.]/@/@g' | \