Update git.mk from pango
This commit is contained in:
parent
cd3510ce1f
commit
7df17ad475
13
git.mk
13
git.mk
@ -82,7 +82,7 @@ git-mk-install:
|
|||||||
### .gitignore generation
|
### .gitignore generation
|
||||||
|
|
||||||
$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
|
$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
|
||||||
@echo Generating $@; \
|
$(AM_V_GEN) \
|
||||||
{ \
|
{ \
|
||||||
if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
|
if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
|
||||||
for x in \
|
for x in \
|
||||||
@ -115,6 +115,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
|
|||||||
po/.intltool-merge-cache \
|
po/.intltool-merge-cache \
|
||||||
"po/*.gmo" \
|
"po/*.gmo" \
|
||||||
"po/*.mo" \
|
"po/*.mo" \
|
||||||
|
po/$(GETTEXT_PACKAGE).pot \
|
||||||
intltool-extract.in \
|
intltool-extract.in \
|
||||||
intltool-merge.in \
|
intltool-merge.in \
|
||||||
intltool-update.in \
|
intltool-update.in \
|
||||||
@ -135,6 +136,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
|
|||||||
$(GITIGNOREFILES) \
|
$(GITIGNOREFILES) \
|
||||||
$(CLEANFILES) \
|
$(CLEANFILES) \
|
||||||
$(PROGRAMS) \
|
$(PROGRAMS) \
|
||||||
|
$(check_PROGRAMS) \
|
||||||
$(EXTRA_PROGRAMS) \
|
$(EXTRA_PROGRAMS) \
|
||||||
$(LTLIBRARIES) \
|
$(LTLIBRARIES) \
|
||||||
so_locations \
|
so_locations \
|
||||||
@ -161,7 +163,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
|
|||||||
} | \
|
} | \
|
||||||
sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
|
sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
|
||||||
sed 's@/[.]/@/@g' | \
|
sed 's@/[.]/@/@g' | \
|
||||||
LANG=C sort | uniq > $@.tmp && \
|
LC_ALL=C sort | uniq > $@.tmp && \
|
||||||
mv $@.tmp $@;
|
mv $@.tmp $@;
|
||||||
|
|
||||||
all: $(srcdir)/.gitignore gitignore-recurse-maybe
|
all: $(srcdir)/.gitignore gitignore-recurse-maybe
|
||||||
@ -170,8 +172,11 @@ gitignore-recurse-maybe:
|
|||||||
$(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
|
$(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
|
||||||
fi;
|
fi;
|
||||||
gitignore-recurse:
|
gitignore-recurse:
|
||||||
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
|
@for subdir in $(DIST_SUBDIRS); do \
|
||||||
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse); \
|
case " $(SUBDIRS) " in \
|
||||||
|
*" $$subdir "*) :;; \
|
||||||
|
*) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir");; \
|
||||||
|
esac; \
|
||||||
done
|
done
|
||||||
gitignore: $(srcdir)/.gitignore gitignore-recurse
|
gitignore: $(srcdir)/.gitignore gitignore-recurse
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user