summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorCarlos O'Ryan <coryan@users.noreply.github.com>2017-12-03 19:07:35 (GMT)
committerCarlos O'Ryan <coryan@users.noreply.github.com>2017-12-03 19:07:35 (GMT)
commitaea8580ecf448bc9d783181996139cae60ce44c9 (patch)
tree66fb79b90b978a99fc3e3118eefe65a68bce6a8f /.gitignore
parent247a3d8e5e5d403f7fcacdb8ccc71e5059f15daa (diff)
downloadgoogletest-aea8580ecf448bc9d783181996139cae60ce44c9.zip
googletest-aea8580ecf448bc9d783181996139cae60ce44c9.tar.gz
googletest-aea8580ecf448bc9d783181996139cae60ce44c9.tar.bz2
Run autoconf from top-level directory.
This is part (hopefully all) of the fixes for #776. The top-level configure.ac configures googletest first and then googlemock. With this changes it is possible to embed googletest into another project that uses autoconf. For an example (though it is WIP), see the commits (and soon PR) referenced from google/protobuf#236.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore16
1 files changed, 16 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 4cea432..b294d3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,19 @@ Win32-Debug/
Win32-Release/
x64-Debug/
x64-Release/
+
+# Ignore autoconf / automake files
+Makefile.in
+aclocal.m4
+configure
+build-aux/
+autom4te.cache/
+googletest/m4/libtool.m4
+googletest/m4/ltoptions.m4
+googletest/m4/ltsugar.m4
+googletest/m4/ltversion.m4
+googletest/m4/lt~obsolete.m4
+
+# Ignore generated directories.
+googlemock/fused-src/
+googletest/fused-src/