[nautilus/wip/ernestask/meson: 2/2] general: drop git.mk



commit 0e65aa1453a483d4f01fcdeba22ad5b069ab14bc
Author: Ernestas Kulik <ernestask src gnome org>
Date:   Thu Feb 23 19:10:37 2017 +0200

    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

 .gitignore                                       |   32 ++
 Makefile.am                                      |    7 -
 data/.gitignore                                  |    9 +
 data/Makefile.am                                 |    2 -
 data/icons/Makefile.am                           |    2 -
 docs/.gitignore                                  |    1 +
 docs/Makefile.am                                 |    2 -
 docs/reference/Makefile.am                       |    2 -
 docs/reference/libnautilus-extension/Makefile.am |    2 -
 eel/.gitignore                                   |    1 +
 eel/Makefile.am                                  |    2 -
 git.mk                                           |  350 ----------------------
 libnautilus-extension/.gitignore                 |    3 +
 libnautilus-extension/Makefile.am                |    2 -
 nautilus-desktop/.gitignore                      |    1 +
 nautilus-desktop/Makefile.am                     |    2 -
 nautilus-sendto-extension/Makefile.am            |    2 -
 po/.gitignore                                    |   11 +
 src/.gitignore                                   |   13 +
 src/Makefile.am                                  |    2 -
 test/.gitignore                                  |    6 +
 test/Makefile.am                                 |    2 -
 22 files changed, 77 insertions(+), 379 deletions(-)
---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1f9a046
--- /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 ba83976..aca507c 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 0000000..fe14726
--- /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 9eeb144..c67006a 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 4fb1735..f56ffdf 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 0000000..86883a6
--- /dev/null
+++ b/docs/.gitignore
@@ -0,0 +1 @@
+/reference/libnautilus-extension/version.xml
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 994f20d..1a3bbd5 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 1d201f7..fd642ed 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 1e0dc09..c321908 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 0000000..6ea0174
--- /dev/null
+++ b/eel/.gitignore
@@ -0,0 +1 @@
+/check-program
diff --git a/eel/Makefile.am b/eel/Makefile.am
index 8367829..a51d856 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/libnautilus-extension/.gitignore b/libnautilus-extension/.gitignore
new file mode 100644
index 0000000..e5781c4
--- /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 caa397c..a67f344 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 0000000..c58f84e
--- /dev/null
+++ b/nautilus-desktop/.gitignore
@@ -0,0 +1 @@
+/nautilus-desktop
diff --git a/nautilus-desktop/Makefile.am b/nautilus-desktop/Makefile.am
index 4d4baba..022e84d 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 49b37e0..752865b 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 0000000..6932e81
--- /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 0000000..40b4e3a
--- /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 c79c030..8ec8031 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 0000000..06eb5d9
--- /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 5591d60..e1b1e1a 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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]