aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2010-04-22 23:37:47 +0000
committerzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2010-04-22 23:37:47 +0000
commit33605ba45417979cff7254c1196dfee65a7275b3 (patch)
tree605e5164cedef35af498c6bab63c750951d35216 /Makefile.am
parent090c4830ddf39c0468f607f0d6b629ac6b4b0e4e (diff)
downloadgoogletest-33605ba45417979cff7254c1196dfee65a7275b3.tar.gz
googletest-33605ba45417979cff7254c1196dfee65a7275b3.tar.bz2
googletest-33605ba45417979cff7254c1196dfee65a7275b3.zip
Adds Each(m) (by Wojtek Moczydlowski); removes scripts/test/Makefile (by Zhanyong Wan); pulls in gtest r424.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am4
1 files changed, 1 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 8e9b61c3..f0aa5c5c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -137,9 +137,7 @@ EXTRA_DIST += include/gmock/gmock-generated-actions.h.pump \
include/gmock/internal/gmock-generated-internal-utils.h.pump
# Script for fusing Google Mock and Google Test source files.
-EXTRA_DIST += \
- scripts/fuse_gmock_files.py \
- scripts/test/Makefile
+EXTRA_DIST += scripts/fuse_gmock_files.py
# The Google Mock Generator tool from the cppclean project.
EXTRA_DIST += \