summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2009-05-03 20:08:11 -0400
committerBehdad Esfahbod <behdad@behdad.org>2009-05-04 14:29:21 -0400
commita398c840be41102f170e79183a8bb9e8b6fa3a26 (patch)
treeb4651e8ab981743521888014be9cbf9afbcbdfd8 /gtk
parente5702523fff7cbb7c935eadb4503e2b70e48e5fb (diff)
downloadgtk+-a398c840be41102f170e79183a8bb9e8b6fa3a26.tar.gz
Add git.mk to generate .gitignore files
Add four new doc templates that were not in repository.
Diffstat (limited to 'gtk')
-rw-r--r--gtk/Makefile.am4
-rw-r--r--gtk/tests/Makefile.am2
-rw-r--r--gtk/theme-bits/Makefile.am2
3 files changed, 7 insertions, 1 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 2339a86543..a0dc9a984e 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -778,7 +778,7 @@ gtk_extra_sources = \
#
# setup GTK+ sources and their dependencies
#
-MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files) $(GENERATED_ICONS)
+MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files) $(GENERATED_ICONS) stock-icons/icon-theme.cache
EXTRA_HEADERS =
EXTRA_DIST += $(gtk_private_h_sources) $(gtk_extra_sources)
EXTRA_DIST += $(gtk_built_sources)
@@ -1286,3 +1286,5 @@ EXTRA_DIST += \
install-data-local:
+
+-include $(top_srcdir)/git.mk
diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am
index f36d5e5383..4c8ff1f1a6 100644
--- a/gtk/tests/Makefile.am
+++ b/gtk/tests/Makefile.am
@@ -77,3 +77,5 @@ defaultvalue_LDADD = $(progs_ldadd)
TEST_PROGS += textbuffer
textbuffer_SOURCES = textbuffer.c pixbuf-init.c
textbuffer_LDADD = $(progs_ldadd)
+
+-include $(top_srcdir)/git.mk
diff --git a/gtk/theme-bits/Makefile.am b/gtk/theme-bits/Makefile.am
index eb24bfc76c..4ad04978a4 100644
--- a/gtk/theme-bits/Makefile.am
+++ b/gtk/theme-bits/Makefile.am
@@ -11,3 +11,5 @@ decompose_bits_SOURCES = decompose-bits.c
decompose_bits_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
EXTRA_DIST += check-13.png check-13-inconsistent.png radio-13.png radio-13-inconsistent.png
+
+-include $(top_srcdir)/git.mk