Janitor: make distcheck and .gitignore

  Distribute ChangeLog but not autogen.sh.
  Use a single toplevel .gitignore file, instead of one per subdirectory.

11 files changed, 11 insertions, 52 deletions

diff --git a/.gitignore b/.gitignore
index 1a0f906..70042c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.deps
+.libs
 aclocal.m4
 autom4te.cache
 compile
@@ -9,6 +11,7 @@ config.status
 config.sub
 configure
 depcomp
+fontconf.h
 install-sh
 libtool
 ltmain.sh
@@ -16,6 +19,12 @@ Makefile
 Makefile.in
 missing
 mkinstalldirs
-stamp-h1
+stamp-h?
 xfont.pc
 *~
+*.la
+*.lo
+*.o
+libXfont-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 7971605..1da055b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,7 @@ nodist_libXfontinclude_HEADERS = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xfont.pc
 
-EXTRA_DIST = xfont.pc.in autogen.sh include/X11/fonts/fontconf.h.in
+EXTRA_DIST = xfont.pc.in ChangeLog include/X11/fonts/fontconf.h.in
 
 .PHONY: ChangeLog
 
diff --git a/include/X11/fonts/.gitignore b/include/X11/fonts/.gitignore
deleted file mode 100644
index d8b6626..0000000
--- a/include/X11/fonts/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-fontconf.h
-stamp-h2
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 9fb9857..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-*.la
-*.lo
-.deps
-.libs
-Makefile
-Makefile.in
diff --git a/src/FreeType/.gitignore b/src/FreeType/.gitignore
deleted file mode 100644
index 5200253..0000000
--- a/src/FreeType/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-*.la
-.libs
-*.lo
-Makefile
-Makefile.in
diff --git a/src/bitmap/.gitignore b/src/bitmap/.gitignore
deleted file mode 100644
index 5200253..0000000
--- a/src/bitmap/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-*.la
-.libs
-*.lo
-Makefile
-Makefile.in
diff --git a/src/builtins/.gitignore b/src/builtins/.gitignore
deleted file mode 100644
index 5200253..0000000
--- a/src/builtins/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-*.la
-.libs
-*.lo
-Makefile
-Makefile.in
diff --git a/src/fc/.gitignore b/src/fc/.gitignore
deleted file mode 100644
index 5200253..0000000
--- a/src/fc/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-*.la
-.libs
-*.lo
-Makefile
-Makefile.in
diff --git a/src/fontfile/.gitignore b/src/fontfile/.gitignore
deleted file mode 100644
index 5200253..0000000
--- a/src/fontfile/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-*.la
-.libs
-*.lo
-Makefile
-Makefile.in
diff --git a/src/stubs/.gitignore b/src/stubs/.gitignore
deleted file mode 100644
index 5200253..0000000
--- a/src/stubs/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-*.la
-.libs
-*.lo
-Makefile
-Makefile.in
diff --git a/src/util/.gitignore b/src/util/.gitignore
deleted file mode 100644
index 5200253..0000000
--- a/src/util/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-*.la
-.libs
-*.lo
-Makefile
-Makefile.in