Skip to content
Browse files

Update git.mk from pango

  • Loading branch information...
1 parent cd3510c commit 7df17ad475116c7ee686f47f0b10cda1ff8ca182 Pablo Castellano committed Aug 3, 2010
Showing with 9 additions and 4 deletions.
  1. +9 −4 git.mk
View
13 git.mk
@@ -82,7 +82,7 @@ git-mk-install:
### .gitignore generation
$(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 \
for x in \
@@ -115,6 +115,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
po/.intltool-merge-cache \
"po/*.gmo" \
"po/*.mo" \
+ po/$(GETTEXT_PACKAGE).pot \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
@@ -135,6 +136,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
$(GITIGNOREFILES) \
$(CLEANFILES) \
$(PROGRAMS) \
+ $(check_PROGRAMS) \
$(EXTRA_PROGRAMS) \
$(LTLIBRARIES) \
so_locations \
@@ -161,7 +163,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
} | \
sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
sed 's@/[.]/@/@g' | \
- LANG=C sort | uniq > $@.tmp && \
+ LC_ALL=C sort | uniq > $@.tmp && \
mv $@.tmp $@;
all: $(srcdir)/.gitignore gitignore-recurse-maybe
@@ -170,8 +172,11 @@ gitignore-recurse-maybe:
$(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
fi;
gitignore-recurse:
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse); \
+ @for subdir in $(DIST_SUBDIRS); do \
+ case " $(SUBDIRS) " in \
+ *" $$subdir "*) :;; \
+ *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir");; \
+ esac; \
done
gitignore: $(srcdir)/.gitignore gitignore-recurse

0 comments on commit 7df17ad

Please sign in to comment.
Something went wrong with that request. Please try again.