Migrate modules/.gitignore into .gitignore

* .gitignore: Add former contents of modules/.gitignore.
* modules/.gitignore: Remove.

.gitignore

@@ -42,6 +42,7 @@ InfoPlist.strings
 Makefile
 makefile
 !etc/refcards/Makefile
+!modules/mod-test/Makefile
 !test/automated/data/flymake/Makefile
 !test/indent/Makefile
 !test/etags/Makefile
@@ -139,6 +140,7 @@ src/stamp-h1
 *.elc
 *.o
 *.res
+*.so
 [0-9]*.core
 core
 core.*[0-9]
@@ -207,6 +209,7 @@ lisp/international/uni-*.el
 *.cms
 *.cp
 *.cps
+*.doc
 *.dvi
 *.fn
 *.fns

modules/.gitignore

@@ -1,8 +0,0 @@
-# built modules
-*.so
-
-# built DOCFILEs
-*.doc
-
-# include makefile for now
-!Makefile