Integrate htools's gitignore in top-level one

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>

diff --git a/.gitignore b/.gitignore
index 35b9a9f..e76d81d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,9 @@
 *.py[co]
 *.swp
 *~
+*.o
+*.hi
+*.hp
 .dir
 
 # /
@@ -88,3 +91,19 @@
 /scripts/gnt-job
 /scripts/gnt-node
 /scripts/gnt-os
+
+# htools-specific rules
+/htools/apidoc
+/htools/.hpc
+/htools/coverage
+
+/htools/hbal
+/htools/hscan
+/htools/hail
+/htools/hspace
+/htools/test
+/htools/*.prof*
+/htools/*.stat
+/htools/*.tix
+
+/htools/Ganeti/HTools/Version.hs

diff --git a/htools/.gitignore b/htools/.gitignore
deleted file mode 100644 (file)
index 9f0bb6b..0000000
--- a/htools/.gitignore
+++ /dev/null
@@ -1,34 +0,0 @@
-/apidoc
-/.hpc
-/coverage
-
-/man/*.1
-/man/*.html
-
-/doc/*.html
-
-*.o
-*.patch
-*.diff
-*.hi
-*.hp
-*.ps
-
-TAGS
-README.html
-NEWS.html
-
-hbal
-hscan
-hail
-hspace
-test
-*.prof*
-*.stat
-*.tix
-
-version
-Version.hs
-
-*.tar.gz
-*.tar.gz.asc