summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErnestas Kulik <ernestask@src.gnome.org>2017-02-23 19:10:37 +0200
committerErnestas Kulik <ernestask@src.gnome.org>2017-02-24 00:24:27 +0200
commit728300331dc5caa6142704e0e4cd70004bf0037a (patch)
treea765b5c2b58ea6fd7055fe24b2f43811e0bbfeec
parent9edc580ca0b8dfc719a1cfb9a5c03e83fb56acc4 (diff)
downloadnautilus-728300331dc5caa6142704e0e4cd70004bf0037a.tar.gz
general: drop git.mk
This commit removes git.mk and adds hand-written gitignore files. That is needed to ignore build/, which is the directory of choice for Meson builds. https://bugzilla.gnome.org/show_bug.cgi?id=778167
-rw-r--r--.gitignore32
-rw-r--r--Makefile.am7
-rw-r--r--data/.gitignore9
-rw-r--r--data/Makefile.am2
-rw-r--r--data/icons/Makefile.am2
-rw-r--r--docs/.gitignore1
-rw-r--r--docs/Makefile.am2
-rw-r--r--docs/reference/Makefile.am2
-rw-r--r--docs/reference/libnautilus-extension/Makefile.am2
-rw-r--r--eel/.gitignore1
-rw-r--r--eel/Makefile.am2
-rw-r--r--git.mk350
-rw-r--r--libnautilus-extension/.gitignore3
-rw-r--r--libnautilus-extension/Makefile.am2
-rw-r--r--nautilus-desktop/.gitignore1
-rw-r--r--nautilus-desktop/Makefile.am2
-rw-r--r--nautilus-sendto-extension/Makefile.am2
-rw-r--r--po/.gitignore11
-rw-r--r--src/.gitignore13
-rw-r--r--src/Makefile.am2
-rw-r--r--test/.gitignore6
-rw-r--r--test/Makefile.am2
22 files changed, 77 insertions, 379 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..1f9a04622
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,32 @@
+*.la
+*.lo
+*.o
+.deps
+.libs
+Makefile
+Makefile.in
+/ABOUT-NLS
+/aclocal.m4
+/autom4te.cache
+/build
+/compile
+/config.h
+/config.h.in
+/config.h.in~
+/config.guess
+/config.log
+/config.rpath
+/config.status
+/config.sub
+/configure
+/depcomp
+/gtk-doc.make
+/install-sh
+/libtool
+/ltmain.sh
+/Makefile
+/Makefile.in
+/m4
+/missing
+/stamp-h1
+/test-driver
diff --git a/Makefile.am b/Makefile.am
index ba8397626..aca507c4c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,13 +31,6 @@ EXTRA_DIST= \
Makefile.shared \
$(NULL)
-MAINTAINERCLEANFILES = \
- $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
- $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
- $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL)
-
DISTCHECK_CONFIGURE_FLAGS = --disable-update-mimedb --enable-gtk-doc
ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
-
--include $(top_srcdir)/git.mk
diff --git a/data/.gitignore b/data/.gitignore
new file mode 100644
index 000000000..fe14726f1
--- /dev/null
+++ b/data/.gitignore
@@ -0,0 +1,9 @@
+/lineup-parameters
+/nautilus-autorun-software.desktop
+/nautilus-autostart.desktop
+/nautilus-classic.desktop
+/org.freedesktop.FileManager1.service
+/org.gnome.Nautilus.appdata.xml
+/org.gnome.Nautilus.desktop
+/org.gnome.Nautilus.service
+/org.gnome.nautilus.gschema.valid
diff --git a/data/Makefile.am b/data/Makefile.am
index 9eeb14499..c67006ae2 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -89,5 +89,3 @@ CLEANFILES = \
if ENABLE_DESKTOP
CLEANFILES += $(autostart_DATA)
endif
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 4fb173505..f56ffdfcf 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -24,5 +24,3 @@ update-icon-cache:
EXTRA_DIST = \
$(nobase_icon_DATA) \
$(srcdir)/src/org.gnome.Nautilus.svg
-
--include $(top_srcdir)/git.mk
diff --git a/docs/.gitignore b/docs/.gitignore
new file mode 100644
index 000000000..86883a6bc
--- /dev/null
+++ b/docs/.gitignore
@@ -0,0 +1 @@
+/reference/libnautilus-extension/version.xml
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 994f20d99..1a3bbd5ba 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -21,5 +21,3 @@ EXTRA_DIST = \
style-guide.html \
key_mouse_navigation.txt \
$(NULL)
-
--include $(top_srcdir)/git.mk
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 1d201f723..fd642edea 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -1,3 +1 @@
SUBDIRS = libnautilus-extension
-
--include $(top_srcdir)/git.mk
diff --git a/docs/reference/libnautilus-extension/Makefile.am b/docs/reference/libnautilus-extension/Makefile.am
index 1e0dc0980..c321908ba 100644
--- a/docs/reference/libnautilus-extension/Makefile.am
+++ b/docs/reference/libnautilus-extension/Makefile.am
@@ -76,5 +76,3 @@ include $(top_srcdir)/gtk-doc.make
# Other files to distribute
# e.g. EXTRA_DIST += version.xml.in
EXTRA_DIST += version.xml.in
-
--include $(top_srcdir)/git.mk
diff --git a/eel/.gitignore b/eel/.gitignore
new file mode 100644
index 000000000..6ea01745b
--- /dev/null
+++ b/eel/.gitignore
@@ -0,0 +1 @@
+/check-program
diff --git a/eel/Makefile.am b/eel/Makefile.am
index 83678299f..a51d8561b 100644
--- a/eel/Makefile.am
+++ b/eel/Makefile.am
@@ -74,5 +74,3 @@ TESTS = check-eel
EXTRA_DIST = \
check-eel \
$(NULL)
-
--include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
deleted file mode 100644
index d3c0e352f..000000000
--- a/git.mk
+++ /dev/null
@@ -1,350 +0,0 @@
-# git.mk, a small Makefile to autogenerate .gitignore files
-# for autotools-based projects.
-#
-# Copyright 2009, Red Hat, Inc.
-# Copyright 2010,2011,2012,2013 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:
-GIT_MK_URL = https://raw.githubusercontent.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, appdata,
-# appstream.
-#
-# 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.
-#
-
-
-
-###############################################################################
-# Variables user modules may want to add to toplevel MAINTAINERCLEANFILES:
-###############################################################################
-
-#
-# Most autotools-using modules should be fine including this variable in their
-# toplevel MAINTAINERCLEANFILES:
-GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \
- $(srcdir)/aclocal.m4 \
- $(srcdir)/autoscan.log \
- $(srcdir)/configure.scan \
- `AUX_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1' ./configure.ac); \
- test "x$$AUX_DIR" = "x$(srcdir)/" && AUX_DIR=$(srcdir); \
- for x in \
- ar-lib \
- compile \
- config.guess \
- config.rpath \
- config.sub \
- depcomp \
- install-sh \
- ltmain.sh \
- missing \
- mkinstalldirs \
- test-driver \
- ylwrap \
- ; do echo "$$AUX_DIR/$$x"; done` \
- `cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' ./configure.ac | \
- head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done`
-#
-# All modules should also be fine including the following variable, which
-# removes automake-generated Makefile.in files:
-GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN = \
- `cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_FILES:$$1' ./configure.ac | \
- while read f; do \
- case $$f in Makefile|*/Makefile) \
- test -f "$(srcdir)/$$f.am" && echo "$(srcdir)/$$f.in";; esac; \
- done`
-#
-# Modules that use libtool and use AC_CONFIG_MACRO_DIR() may also include this,
-# though it's harmless to include regardless.
-GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL = \
- `MACRO_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_MACRO_DIR:$$1' ./configure.ac); \
- if test "x$$MACRO_DIR" != "x$(srcdir)/"; then \
- for x in \
- libtool.m4 \
- ltoptions.m4 \
- ltsugar.m4 \
- ltversion.m4 \
- lt~obsolete.m4 \
- ; do echo "$$MACRO_DIR/$$x"; done; \
- fi`
-
-
-
-###############################################################################
-# Default rule is to install ourselves in all Makefile.am files:
-###############################################################################
-
-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"
-
-git-mk-update:
- wget $(GIT_MK_URL) -O $(top_srcdir)/git.mk
-
-.PHONY: git-all git-mk-install git-mk-update
-
-
-
-###############################################################################
-# Actual .gitignore generation:
-###############################################################################
-
-$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
- @echo "git.mk: Generating $@"
- @{ \
- 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" \
- $(REPORT_FILES) \
- $(DOC_MODULE).pdf \
- xml html \
- ; do echo "/$$x"; done; \
- FLAVOR=$$(cd $(top_srcdir); $(AUTOCONF) --trace 'GTK_DOC_CHECK:$$2' ./configure.ac); \
- case $$FLAVOR in *no-tmpl*) echo /tmpl;; esac; \
- if echo "$(SCAN_OPTIONS)" | grep -q "\-\-rebuild-types"; then \
- echo "/$(DOC_MODULE).types"; \
- fi; \
- if echo "$(SCAN_OPTIONS)" | grep -q "\-\-rebuild-sections"; then \
- echo "/$(DOC_MODULE)-sections.txt"; \
- fi; \
- if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
- for x in \
- $(SETUP_FILES) \
- $(DOC_MODULE).types \
- ; do echo "/$$x"; done; \
- fi; \
- 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 "x$(appdata_XML)" = x; then :; else \
- for x in \
- $(appdata_XML:.xml=.valid) \
- ; do echo "/$$x"; done; \
- fi; \
- if test "x$(appstream_XML)" = x; then :; else \
- for x in \
- $(appstream_XML:.xml=.valid) \
- ; do echo "/$$x"; done; \
- fi; \
- if test -f $(srcdir)/po/Makefile.in.in; then \
- for x in \
- ABOUT-NLS \
- po/Makefile.in.in \
- po/Makefile.in.in~ \
- po/Makefile.in \
- po/Makefile \
- po/Makevars.template \
- po/POTFILES \
- po/Rules-quot \
- po/stamp-it \
- po/stamp-po \
- po/.intltool-merge-cache \
- "po/*.gmo" \
- "po/*.header" \
- "po/*.mo" \
- "po/*.sed" \
- "po/*.sin" \
- 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; \
- if test "x$(am__dirstamp)" = x; then :; else \
- echo "$(am__dirstamp)"; \
- fi; \
- if test "x$(findstring libtool,$(LTCOMPILE))" = x -a "x$(findstring libtool,$(LTCXXCOMPILE))" = x -a "x$(GTKDOC_RUN)" = x; then :; else \
- for x in \
- "*.lo" \
- ".libs" "_libs" \
- ; do echo "$$x"; done; \
- fi; \
- for x in \
- .gitignore \
- $(GITIGNOREFILES) \
- $(CLEANFILES) \
- $(PROGRAMS) $(check_PROGRAMS) $(EXTRA_PROGRAMS) \
- $(LIBRARIES) $(check_LIBRARIES) $(EXTRA_LIBRARIES) \
- $(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \
- so_locations \
- $(MOSTLYCLEANFILES) \
- $(TEST_LOGS) \
- $(TEST_LOGS:.log=.trs) \
- $(TEST_SUITE_LOG) \
- $(TESTS:=.test) \
- "*.gcda" \
- "*.gcno" \
- $(DISTCLEANFILES) \
- $(am__CONFIG_DISTCLEAN_FILES) \
- $(CONFIG_CLEAN_FILES) \
- TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
- "*.tab.c" \
- $(MAINTAINERCLEANFILES) \
- $(BUILT_SOURCES) \
- $(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \
- $(filter %_vala.stamp,$(DIST_COMMON)) \
- $(filter %.vapi,$(DIST_COMMON)) \
- $(filter $(addprefix %,$(notdir $(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))))),$(DIST_COMMON)) \
- Makefile \
- Makefile.in \
- "*.orig" \
- "*.rej" \
- "*.bak" \
- "*~" \
- ".*.sw[nop]" \
- ".dirstamp" \
- ; do echo "/$$x"; done; \
- for x in \
- "*.$(OBJEXT)" \
- $(DEPDIR) \
- ; 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" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir");; \
- esac; \
- done
-gitignore-recurse:
- @for subdir in $(DIST_SUBDIRS); do \
- test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || 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/libnautilus-extension/.gitignore b/libnautilus-extension/.gitignore
new file mode 100644
index 000000000..e5781c46b
--- /dev/null
+++ b/libnautilus-extension/.gitignore
@@ -0,0 +1,3 @@
+/*.pc
+/Nautilus-3.0.gir
+/Nautilus-3.0.typelib
diff --git a/libnautilus-extension/Makefile.am b/libnautilus-extension/Makefile.am
index caa397cde..a67f34492 100644
--- a/libnautilus-extension/Makefile.am
+++ b/libnautilus-extension/Makefile.am
@@ -85,5 +85,3 @@ typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
CLEANFILES += $(gir_DATA) $(typelibs_DATA)
endif
-
--include $(top_srcdir)/git.mk
diff --git a/nautilus-desktop/.gitignore b/nautilus-desktop/.gitignore
new file mode 100644
index 000000000..c58f84ea8
--- /dev/null
+++ b/nautilus-desktop/.gitignore
@@ -0,0 +1 @@
+/nautilus-desktop
diff --git a/nautilus-desktop/Makefile.am b/nautilus-desktop/Makefile.am
index 4d4baba2b..022e84d88 100644
--- a/nautilus-desktop/Makefile.am
+++ b/nautilus-desktop/Makefile.am
@@ -53,5 +53,3 @@ nautilus_desktop_SOURCES= \
nautilus-desktop-window-slot.c \
nautilus-desktop-window-slot.h \
$(NULL)
-
--include $(top_srcdir)/git.mk
diff --git a/nautilus-sendto-extension/Makefile.am b/nautilus-sendto-extension/Makefile.am
index 49b37e071..752865b13 100644
--- a/nautilus-sendto-extension/Makefile.am
+++ b/nautilus-sendto-extension/Makefile.am
@@ -21,5 +21,3 @@ libnautilus_sendto_la_LDFLAGS = -module -avoid-version -no-undefined
libnautilus_sendto_la_LIBADD = \
$(top_builddir)/libnautilus-extension/libnautilus-extension.la \
$(BASE_LIBS)
-
--include $(top_srcdir)/git.mk
diff --git a/po/.gitignore b/po/.gitignore
new file mode 100644
index 000000000..6932e815c
--- /dev/null
+++ b/po/.gitignore
@@ -0,0 +1,11 @@
+/*.gmo
+/*.header
+/*.sed
+/*.sin
+/Makefile
+/Makefile.in.in
+/Makevars.template
+/nautilus.pot
+/POTFILES
+/Rules-quot
+/stamp-po
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 000000000..40b4e3a0b
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,13 @@
+.dirstamp
+/nautilus
+/nautilus-autorun-software
+/nautilus-enum-types.c
+/nautilus-enum-types.h
+/nautilus-freedesktop-generated.c
+/nautilus-freedesktop-generated.h
+/nautilus-generated.c
+/nautilus-generated.h
+/nautilus-resources.c
+/nautilus-resources.h
+/nautilus-shell-search-provider-generated.c
+/nautilus-shell-search-provider-generated.h
diff --git a/src/Makefile.am b/src/Makefile.am
index c79c03064..8ec803188 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -403,5 +403,3 @@ EXTRA_DIST = \
dist-hook:
cd $(distdir); rm -f $(CLEANFILES)
-
--include $(top_srcdir)/git.mk
diff --git a/test/.gitignore b/test/.gitignore
new file mode 100644
index 000000000..06eb5d905
--- /dev/null
+++ b/test/.gitignore
@@ -0,0 +1,6 @@
+/test-eel-string-get-common-prefix
+/test-eel-string-rtrim-punctuation
+/test-file-utilities-get-common-filename-prefix
+/test-nautilus-copy
+/test-nautilus-directory-async
+/test-nautilus-search-engine
diff --git a/test/Makefile.am b/test/Makefile.am
index 5591d60d4..e1b1e1a6c 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -45,5 +45,3 @@ TESTS = test-file-utilities-get-common-filename-prefix \
EXTRA_DIST = \
test.h \
$(NULL)
-
--include $(top_srcdir)/git.mk