blob: b8bafcfccd6fbeaf419925fcb5c6026e46750186 [file] [log] [blame]
diff --git a/googlemock/Makefile.am b/googlemock/Makefile.am
index 9adbc51..e3129a3 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
+
+pkginclude_internal_customdir = $(pkgincludedir)/internal/custom
+pkginclude_internal_custom_HEADERS = \
include/gmock/internal/custom/gmock-generated-actions.h \
include/gmock/internal/custom/gmock-matchers.h \
include/gmock/internal/custom/gmock-port.h
@@ -191,7 +194,7 @@ if HAVE_PYTHON
$(test_gmock_fused_test_SOURCES): fused-gmock-internal
# TODO(vladl@google.com): Find a way to add Google Tests's sources here.
-fused-gmock-internal: $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) \
+fused-gmock-internal: $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) $(pkginclude_internal_custom_HEADERS)\
$(lib_libgmock_la_SOURCES) $(GMOCK_SOURCE_INGLUDES) \
$(lib_libgmock_main_la_SOURCES) \
scripts/fuse_gmock_files.py
@@ -216,9 +219,11 @@ CLEANFILES = core
# One-Definition Rule.
install-exec-local:
+disabled-install-exec-local:
echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Mock into your build system."
false
install-data-local:
+disabled-install-data-local:
echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Mock into your build system."
false