diff options
| author | Billy Donahue <BillyDonahue@users.noreply.github.com> | 2015-09-20 03:44:08 -0400 |
|---|---|---|
| committer | Billy Donahue <BillyDonahue@users.noreply.github.com> | 2015-09-20 03:44:08 -0400 |
| commit | 9751f4dfa4d633e53ef753c30feafa500b65e826 (patch) | |
| tree | 5bbd41fb0677f06a4ca38d076bd22691fe321ebf | |
| parent | c8c8f8c587286f19de2e6c4828e61a6f119b5d47 (diff) | |
| parent | 210392eb2796d6bd4bdb399bbec6c8e7b3e469cb (diff) | |
| download | googletest-9751f4dfa4d633e53ef753c30feafa500b65e826.tar.gz googletest-9751f4dfa4d633e53ef753c30feafa500b65e826.tar.bz2 googletest-9751f4dfa4d633e53ef753c30feafa500b65e826.zip | |
Merge pull request #594 from martinmaly/gmock
Adding missing files to googlemock distribution.
| -rw-r--r-- | googlemock/Makefile.am | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/googlemock/Makefile.am b/googlemock/Makefile.am index 7ad45888..9adbc516 100644 --- a/googlemock/Makefile.am +++ b/googlemock/Makefile.am @@ -42,7 +42,10 @@ pkginclude_internaldir = $(pkgincludedir)/internal pkginclude_internal_HEADERS = \ include/gmock/internal/gmock-generated-internal-utils.h \ include/gmock/internal/gmock-internal-utils.h \ - include/gmock/internal/gmock-port.h + include/gmock/internal/gmock-port.h \ + include/gmock/internal/custom/gmock-generated-actions.h \ + include/gmock/internal/custom/gmock-matchers.h \ + include/gmock/internal/custom/gmock-port.h lib_libgmock_main_la_SOURCES = src/gmock_main.cc lib_libgmock_main_la_LIBADD = lib/libgmock.la @@ -136,7 +139,8 @@ EXTRA_DIST += \ include/gmock/gmock-generated-function-mockers.h.pump \ include/gmock/gmock-generated-matchers.h.pump \ include/gmock/gmock-generated-nice-strict.h.pump \ - include/gmock/internal/gmock-generated-internal-utils.h.pump + include/gmock/internal/gmock-generated-internal-utils.h.pump \ + include/gmock/internal/custom/gmock-generated-actions.h.pump # Script for fusing Google Mock and Google Test source files. EXTRA_DIST += scripts/fuse_gmock_files.py |