Restore delete Makefiles and fix .gitignore.

 * .gitignore: Update Makefiles to changed locations
 * test/lisp/progmodes/flymake-resources/Makefile,
   test/manual/etags/Makefile,
   test/manual/etags/make-src/Makefile,
   test/manual/indent/Makefile: Restored and moved to new location.

1 files changed, 13 insertions, 0 deletions

diff --git a/test/lisp/progmodes/flymake-resources/Makefile b/test/lisp/progmodes/flymake-resources/Makefile
new file mode 100644
index 00000000000..0f3f39791c8
--- /dev/null
+++ b/test/lisp/progmodes/flymake-resources/Makefile
@@ -0,0 +1,13 @@
+# Makefile for flymake tests
+
+CC_OPTS = -Wall
+
+## Recent gcc (e.g. 4.8.2 on RHEL7) can automatically colorize their output,
+## which can confuse flymake.  Set GCC_COLORS to disable that.
+## This only seems to be an issue in batch mode, where you would not
+## normally use flymake, so it seems like just avoiding the issue
+## in this test is fine.  Set flymake-log-level to 3 to investigate.
+check-syntax:
+        GCC_COLORS= $(CC) $(CC_OPTS) ${CHK_SOURCES}
+
+# eof