summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2013-03-25 12:05:42 -0400
committerCosimo Cecchi <cosimoc@gnome.org>2013-03-25 12:09:09 -0400
commit837c10c4c9719327b2af1b8ea74ad18f8a5a65d1 (patch)
tree93f4fc4c0185151a0c736baf4417c5ccd57eb625
parentc955eaef8a49741fd3c0b19ad9d0ebba21c3188d (diff)
downloadgnome-themes-standard-837c10c4c9719327b2af1b8ea74ad18f8a5a65d1.tar.gz
build: update .gitignore
Don't use git.mk, just a static .gitignore.
-rw-r--r--.gitignore67
-rw-r--r--Makefile.am2
-rw-r--r--git.mk227
-rw-r--r--themes/Adwaita/Makefile.am3
-rw-r--r--themes/Adwaita/backgrounds/Makefile.am2
-rw-r--r--themes/Adwaita/cursors/Makefile.am2
-rw-r--r--themes/Adwaita/gtk-2.0/Makefile.am2
-rw-r--r--themes/Adwaita/gtk-3.0/Makefile.am2
-rw-r--r--themes/Adwaita/metacity-1/Makefile.am4
-rw-r--r--themes/HighContrast/Makefile.am2
-rw-r--r--themes/HighContrast/gtk-2.0/Makefile.am2
-rw-r--r--themes/HighContrast/gtk-3.0/Makefile.am2
-rw-r--r--themes/HighContrast/icons/48x48/.gitignore2
-rw-r--r--themes/HighContrast/icons/48x48/animations/.gitignore2
-rw-r--r--themes/HighContrast/icons/Makefile.am2
-rw-r--r--themes/HighContrast/icons/scalable/.gitignore2
-rw-r--r--themes/HighContrast/icons/scalable/actions/.gitignore2
-rw-r--r--themes/HighContrast/icons/scalable/apps/.gitignore2
-rw-r--r--themes/HighContrast/icons/scalable/categories/.gitignore2
-rw-r--r--themes/HighContrast/icons/scalable/devices/.gitignore2
-rw-r--r--themes/HighContrast/icons/scalable/emblems/.gitignore2
-rw-r--r--themes/HighContrast/icons/scalable/mimetypes/.gitignore2
-rw-r--r--themes/HighContrast/icons/scalable/places/.gitignore2
-rw-r--r--themes/HighContrast/icons/scalable/status/.gitignore2
-rw-r--r--themes/HighContrast/metacity-1/Makefile.am3
-rw-r--r--themes/Makefile.am2
26 files changed, 67 insertions, 279 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..4fb0815c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,67 @@
+*.bak
+*.gresource
+*.la
+*.lo
+*.o
+*.orig
+*.rej
+*.tab.c
+*.tar.xz
+*~
+*#
+.#*
+.*.sw[nop]
+.deps
+.dirstamp
+.libs
+GPATH
+GRTAGS
+GSYMS
+GTAGS
+ID
+Makefile
+Makefile.in
+TAGS
+_libs
+aclocal.m4
+autom4te.cache
+compile
+config.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.lt
+config.status
+config.status.lineno
+config.sub
+configure
+configure.lineno
+depcomp
+install-sh
+intltool-*.in
+intltool-extract.in
+intltool-merge.in
+intltool-update.in
+libtool
+ltmain.sh
+missing
+mkinstalldirs
+po/*.gmo
+po/*.mo
+po/.intltool-merge-cache
+po/Makefile
+po/Makefile.in
+po/Makefile.in.in
+po/POTFILES
+po/gnome-themes-standard.pot
+po/stamp-it
+so_locations
+stamp-h1
+tags
+themes/Adwaita/index.theme
+themes/Adwaita/backgrounds/*.xml
+themes/Adwaita/backgrounds/adwaita.xml.in
+themes/HighContrast/create-highcontrast
+themes/HighContrast/icons/index.theme
+themes/HighContrast/index.theme
diff --git a/Makefile.am b/Makefile.am
index 9c665841..2a5dd507 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,5 +33,3 @@ dist-hook:
# in theme files
install-data-local:
$(MAKE) -C po uninstall
-
--include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
deleted file mode 100644
index d5bf7b84..00000000
--- a/git.mk
+++ /dev/null
@@ -1,227 +0,0 @@
-# git.mk
-#
-# Copyright 2009, Red Hat, Inc.
-# Copyright 2010,2011 Behdad Esfahbod
-# Written by Behdad Esfahbod
-#
-# Copying and distribution of this file, with or without modification,
-# is permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.
-#
-# The latest version of this file can be downloaded from:
-# https://raw.github.com/behdad/git.mk/master/git.mk
-# Bugs, etc, should be reported upstream at:
-# https://github.com/behdad/git.mk
-#
-# To use in your project, import this file in your git repo's toplevel,
-# then do "make -f git.mk". This modifies all Makefile.am files in
-# your project to -include git.mk. Remember to add that line to new
-# Makefile.am files you create in your project, or just rerun the
-# "make -f git.mk".
-#
-# This enables automatic .gitignore generation. If you need to ignore
-# more files, add them to the GITIGNOREFILES variable in your Makefile.am.
-# But think twice before doing that. If a file has to be in .gitignore,
-# chances are very high that it's a generated file and should be in one
-# of MOSTLYCLEANFILES, CLEANFILES, DISTCLEANFILES, or MAINTAINERCLEANFILES.
-#
-# The only case that you need to manually add a file to GITIGNOREFILES is
-# when remove files in one of mostlyclean-local, clean-local, distclean-local,
-# or maintainer-clean-local make targets.
-#
-# Note that for files like editor backup, etc, there are better places to
-# ignore them. See "man gitignore".
-#
-# If "make maintainer-clean" removes the files but they are not recognized
-# by this script (that is, if "git status" shows untracked files still), send
-# me the output of "git status" as well as your Makefile.am and Makefile for
-# the directories involved and I'll diagnose.
-#
-# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
-# Makefile.am.sample in the git.mk git repo.
-#
-# Don't EXTRA_DIST this file. It is supposed to only live in git clones,
-# not tarballs. It serves no useful purpose in tarballs and clutters the
-# build dir.
-#
-# This file knows how to handle autoconf, automake, libtool, gtk-doc,
-# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu.
-#
-# This makefile provides the following targets:
-#
-# - all: "make all" will build all gitignore files.
-# - gitignore: makes all gitignore files in the current dir and subdirs.
-# - .gitignore: make gitignore file for the current dir.
-# - gitignore-recurse: makes all gitignore files in the subdirs.
-#
-# KNOWN ISSUES:
-#
-# - Recursive configure doesn't work as $(top_srcdir)/git.mk inside the
-# submodule doesn't find us. If you have configure.{in,ac} files in
-# subdirs, add a proxy git.mk file in those dirs that simply does:
-# "include $(top_srcdir)/../git.mk". Add more ..'s to your taste.
-# And add those files to git. See vte/gnome-pty-helper/git.mk for
-# example.
-#
-
-git-all: git-mk-install
-
-git-mk-install:
- @echo Installing git makefile
- @any_failed=; \
- 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 \
- echo $$x already includes git.mk; \
- else \
- failed=; \
- echo "Updating $$x"; \
- { cat $$x; \
- echo ''; \
- echo '-include $$(top_srcdir)/git.mk'; \
- } > $$x.tmp || failed=1; \
- if test x$$failed = x; then \
- mv $$x.tmp $$x || failed=1; \
- fi; \
- if test x$$failed = x; then : else \
- echo Failed updating $$x; >&2 \
- any_failed=1; \
- fi; \
- fi; done; test -z "$$any_failed"
-
-.PHONY: git-all git-mk-install
-
-
-### .gitignore generation
-
-$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
- $(AM_V_GEN) \
- { \
- if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
- for x in \
- $(DOC_MODULE)-decl-list.txt \
- $(DOC_MODULE)-decl.txt \
- tmpl/$(DOC_MODULE)-unused.sgml \
- "tmpl/*.bak" \
- xml html \
- ; do echo /$$x; done; \
- fi; \
- if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
- for lc in $(DOC_LINGUAS); do \
- for x in \
- $(if $(DOC_MODULE),$(DOC_MODULE).xml) \
- $(DOC_PAGES) \
- $(DOC_INCLUDES) \
- ; do echo /$$lc/$$x; done; \
- done; \
- for x in \
- $(_DOC_OMF_ALL) \
- $(_DOC_DSK_ALL) \
- $(_DOC_HTML_ALL) \
- $(_DOC_MOFILES) \
- $(DOC_H_FILE) \
- "*/.xml2po.mo" \
- "*/*.omf.out" \
- ; do echo /$$x; done; \
- fi; \
- if test "x$(HELP_ID)" = x -o "x$(HELP_LINGUAS)" = x; then :; else \
- for lc in $(HELP_LINGUAS); do \
- for x in \
- $(HELP_FILES) \
- "$$lc.stamp" \
- "$$lc.mo" \
- ; do echo /$$lc/$$x; done; \
- done; \
- fi; \
- if test "x$(gsettings_SCHEMAS)" = x; then :; else \
- for x in \
- $(gsettings_SCHEMAS:.xml=.valid) \
- $(gsettings__enum_file) \
- ; do echo /$$x; done; \
- fi; \
- if test -f $(srcdir)/po/Makefile.in.in; then \
- for x in \
- po/Makefile.in.in \
- po/Makefile.in \
- po/Makefile \
- po/POTFILES \
- po/stamp-it \
- po/.intltool-merge-cache \
- "po/*.gmo" \
- "po/*.mo" \
- po/$(GETTEXT_PACKAGE).pot \
- intltool-extract.in \
- intltool-merge.in \
- intltool-update.in \
- ; do echo /$$x; done; \
- fi; \
- if test -f $(srcdir)/configure; then \
- for x in \
- autom4te.cache \
- configure \
- config.h \
- stamp-h1 \
- libtool \
- config.lt \
- ; do echo /$$x; done; \
- fi; \
- if test "x$(DEJATOOL)" = x; then :; else \
- for x in \
- $(DEJATOOL) \
- ; do echo /$$x.sum; echo /$$x.log; done; \
- echo /site.exp; \
- fi; \
- for x in \
- .gitignore \
- $(GITIGNOREFILES) \
- $(CLEANFILES) \
- $(PROGRAMS) $(check_PROGRAMS) $(EXTRA_PROGRAMS) \
- $(LIBRARIES) $(check_LIBRARIES) $(EXTRA_LIBRARIES) \
- $(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \
- so_locations \
- .libs _libs \
- $(MOSTLYCLEANFILES) \
- "*.$(OBJEXT)" \
- "*.lo" \
- $(DISTCLEANFILES) \
- $(am__CONFIG_DISTCLEAN_FILES) \
- $(CONFIG_CLEAN_FILES) \
- TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
- "*.tab.c" \
- $(MAINTAINERCLEANFILES) \
- $(BUILT_SOURCES) \
- $(DEPDIR) \
- Makefile \
- Makefile.in \
- "*.orig" \
- "*.rej" \
- "*.bak" \
- "*~" \
- ".*.sw[nop]" \
- ".dirstamp" \
- ; do echo /$$x; done; \
- } | \
- sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
- sed 's@/[.]/@/@g' | \
- LC_ALL=C sort | uniq > $@.tmp && \
- mv $@.tmp $@;
-
-all: $(srcdir)/.gitignore gitignore-recurse-maybe
-gitignore: $(srcdir)/.gitignore gitignore-recurse
-
-gitignore-recurse-maybe:
- @for subdir in $(DIST_SUBDIRS); do \
- case " $(SUBDIRS) " in \
- *" $$subdir "*) :;; \
- *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse-maybe || echo "Skipping $$subdir");; \
- esac; \
- done
-gitignore-recurse:
- @for subdir in $(DIST_SUBDIRS); do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir"); \
- done
-
-maintainer-clean: gitignore-clean
-gitignore-clean:
- -rm -f $(srcdir)/.gitignore
-
-.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
diff --git a/themes/Adwaita/Makefile.am b/themes/Adwaita/Makefile.am
index 72c609d5..3107e070 100644
--- a/themes/Adwaita/Makefile.am
+++ b/themes/Adwaita/Makefile.am
@@ -19,6 +19,3 @@ theme_DATA = index.theme
DISTCLEANFILES = index.theme
EXTRA_DIST = index.theme.in index.theme
-
--include $(top_srcdir)/git.mk
-
diff --git a/themes/Adwaita/backgrounds/Makefile.am b/themes/Adwaita/backgrounds/Makefile.am
index 8f008f69..50855605 100644
--- a/themes/Adwaita/backgrounds/Makefile.am
+++ b/themes/Adwaita/backgrounds/Makefile.am
@@ -25,5 +25,3 @@ noinst_DATA = adwaita.xml.in
CLEANFILES = adwaita.xml adwaita.xml.in adwaita-timed.xml
EXTRA_DIST = $(background_DATA) adwaita.xml.in.in adwaita-timed.xml.in
-
--include $(top_srcdir)/git.mk
diff --git a/themes/Adwaita/cursors/Makefile.am b/themes/Adwaita/cursors/Makefile.am
index 84adf777..ba07e815 100644
--- a/themes/Adwaita/cursors/Makefile.am
+++ b/themes/Adwaita/cursors/Makefile.am
@@ -3,5 +3,3 @@ cursordir = $(datadir)/icons/Adwaita/cursors
cursor_DATA = $(wildcard data/*)
EXTRA_DIST = $(cursor_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/themes/Adwaita/gtk-2.0/Makefile.am b/themes/Adwaita/gtk-2.0/Makefile.am
index 50ca4014..ede12372 100644
--- a/themes/Adwaita/gtk-2.0/Makefile.am
+++ b/themes/Adwaita/gtk-2.0/Makefile.am
@@ -154,5 +154,3 @@ uninstall-local:
done
EXTRA_DIST = $(theme_DATA) $(asset_data)
-
--include $(top_srcdir)/git.mk
diff --git a/themes/Adwaita/gtk-3.0/Makefile.am b/themes/Adwaita/gtk-3.0/Makefile.am
index 6dd498d5..7ec1f2cd 100644
--- a/themes/Adwaita/gtk-3.0/Makefile.am
+++ b/themes/Adwaita/gtk-3.0/Makefile.am
@@ -30,5 +30,3 @@ EXTRA_DIST = \
CLEANFILES = \
gtk.gresource
-
--include $(top_srcdir)/git.mk
diff --git a/themes/Adwaita/metacity-1/Makefile.am b/themes/Adwaita/metacity-1/Makefile.am
index f1c78b4d..b61f4e90 100644
--- a/themes/Adwaita/metacity-1/Makefile.am
+++ b/themes/Adwaita/metacity-1/Makefile.am
@@ -2,7 +2,3 @@ themedir = $(datadir)/themes/Adwaita/metacity-1
theme_DATA = metacity-theme-2.xml metacity-theme-3.xml
EXTRA_DIST = $(theme_DATA)
-
-
--include $(top_srcdir)/git.mk
-
diff --git a/themes/HighContrast/Makefile.am b/themes/HighContrast/Makefile.am
index e3e5944d..f5d7ecac 100644
--- a/themes/HighContrast/Makefile.am
+++ b/themes/HighContrast/Makefile.am
@@ -23,5 +23,3 @@ endif
DISTCLEANFILES = index.theme
EXTRA_DIST += index.theme.in index.theme
-
--include $(top_srcdir)/git.mk
diff --git a/themes/HighContrast/gtk-2.0/Makefile.am b/themes/HighContrast/gtk-2.0/Makefile.am
index 4bca2de3..eab46ba4 100644
--- a/themes/HighContrast/gtk-2.0/Makefile.am
+++ b/themes/HighContrast/gtk-2.0/Makefile.am
@@ -2,5 +2,3 @@ themedir = $(datadir)/themes/HighContrast/gtk-2.0
theme_DATA = gtkrc
EXTRA_DIST = $(theme_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/themes/HighContrast/gtk-3.0/Makefile.am b/themes/HighContrast/gtk-3.0/Makefile.am
index 7d691da3..41ffeec2 100644
--- a/themes/HighContrast/gtk-3.0/Makefile.am
+++ b/themes/HighContrast/gtk-3.0/Makefile.am
@@ -16,5 +16,3 @@ EXTRA_DIST = \
CLEANFILES = \
gtk.gresource
-
--include $(top_srcdir)/git.mk
diff --git a/themes/HighContrast/icons/48x48/.gitignore b/themes/HighContrast/icons/48x48/.gitignore
deleted file mode 100644
index 282522db..00000000
--- a/themes/HighContrast/icons/48x48/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/themes/HighContrast/icons/48x48/animations/.gitignore b/themes/HighContrast/icons/48x48/animations/.gitignore
deleted file mode 100644
index 282522db..00000000
--- a/themes/HighContrast/icons/48x48/animations/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/themes/HighContrast/icons/Makefile.am b/themes/HighContrast/icons/Makefile.am
index 93803c25..76e824d0 100644
--- a/themes/HighContrast/icons/Makefile.am
+++ b/themes/HighContrast/icons/Makefile.am
@@ -109,5 +109,3 @@ EXTRA_DIST = \
index.theme
DISTCLEANFILES = index.theme
-
--include $(top_srcdir)/git.mk
diff --git a/themes/HighContrast/icons/scalable/.gitignore b/themes/HighContrast/icons/scalable/.gitignore
deleted file mode 100644
index 282522db..00000000
--- a/themes/HighContrast/icons/scalable/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/themes/HighContrast/icons/scalable/actions/.gitignore b/themes/HighContrast/icons/scalable/actions/.gitignore
deleted file mode 100644
index 282522db..00000000
--- a/themes/HighContrast/icons/scalable/actions/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/themes/HighContrast/icons/scalable/apps/.gitignore b/themes/HighContrast/icons/scalable/apps/.gitignore
deleted file mode 100644
index 282522db..00000000
--- a/themes/HighContrast/icons/scalable/apps/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/themes/HighContrast/icons/scalable/categories/.gitignore b/themes/HighContrast/icons/scalable/categories/.gitignore
deleted file mode 100644
index 282522db..00000000
--- a/themes/HighContrast/icons/scalable/categories/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/themes/HighContrast/icons/scalable/devices/.gitignore b/themes/HighContrast/icons/scalable/devices/.gitignore
deleted file mode 100644
index 282522db..00000000
--- a/themes/HighContrast/icons/scalable/devices/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/themes/HighContrast/icons/scalable/emblems/.gitignore b/themes/HighContrast/icons/scalable/emblems/.gitignore
deleted file mode 100644
index 282522db..00000000
--- a/themes/HighContrast/icons/scalable/emblems/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/themes/HighContrast/icons/scalable/mimetypes/.gitignore b/themes/HighContrast/icons/scalable/mimetypes/.gitignore
deleted file mode 100644
index 282522db..00000000
--- a/themes/HighContrast/icons/scalable/mimetypes/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/themes/HighContrast/icons/scalable/places/.gitignore b/themes/HighContrast/icons/scalable/places/.gitignore
deleted file mode 100644
index 282522db..00000000
--- a/themes/HighContrast/icons/scalable/places/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/themes/HighContrast/icons/scalable/status/.gitignore b/themes/HighContrast/icons/scalable/status/.gitignore
deleted file mode 100644
index 282522db..00000000
--- a/themes/HighContrast/icons/scalable/status/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/themes/HighContrast/metacity-1/Makefile.am b/themes/HighContrast/metacity-1/Makefile.am
index 7734ad14..251cc6a0 100644
--- a/themes/HighContrast/metacity-1/Makefile.am
+++ b/themes/HighContrast/metacity-1/Makefile.am
@@ -2,6 +2,3 @@ themedir = $(datadir)/themes/HighContrast/metacity-1
theme_DATA = metacity-theme-3.xml
EXTRA_DIST = $(theme_DATA)
-
-
--include $(top_srcdir)/git.mk
diff --git a/themes/Makefile.am b/themes/Makefile.am
index 537747dc..dc92dd94 100644
--- a/themes/Makefile.am
+++ b/themes/Makefile.am
@@ -1,3 +1 @@
SUBDIRS = Adwaita HighContrast
-
--include $(top_srcdir)/git.mk