commit 93836cfe9dbe3ac05b961191de757c26af323d06
Author: Timothy St. Clair <tstclair(a)redhat.com>
Date: Wed Jul 31 14:50:03 2013 -0500
Update install scripts to enable proper building of gmock-all by other
tools
install.patch | 24 ++++++++----------------
1 files changed, 8 insertions(+), 16 deletions(-)
---
diff --git a/install.patch b/install.patch
index b0fa7b1..8a16d16 100644
--- a/install.patch
+++ b/install.patch
@@ -1,5 +1,5 @@
diff --git a/Makefile.am b/Makefile.am
-index adc21d7..9366a06 100644
+index adc21d7..2077654 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,9 @@ EXTRA_DIST =
@@ -12,7 +12,7 @@ index adc21d7..9366a06 100644
# This is generated by the configure script, so clean it for distribution.
DISTCLEANFILES = scripts/gmock-config
-@@ -21,10 +24,23 @@ if HAVE_PTHREADS
+@@ -21,10 +24,13 @@ if HAVE_PTHREADS
endif
# Build rules for libraries.
@@ -24,21 +24,11 @@ index adc21d7..9366a06 100644
+pkgconfigdir = $(datadir)/pkgconfig
+pkgconfig_DATA = gmock.pc
-+
-+gsrcsdir = $(prefix)/src/@PACKAGE@
-+gsrcs_DATA = \
-+ src/gmock-all.cc \
-+ src/gmock.cc \
-+ src/gmock_main.cc \
-+ src/gmock-spec-builders.cc \
-+ src/gmock-cardinalities.cc \
-+ src/gmock-internal-utils.cc \
-+ src/gmock-matchers.cc
+
pkginclude_HEADERS = \
include/gmock/gmock-actions.h \
include/gmock/gmock-cardinalities.h \
-@@ -43,7 +59,7 @@ pkginclude_internal_HEADERS = \
+@@ -43,7 +49,7 @@ pkginclude_internal_HEADERS = \
include/gmock/internal/gmock-internal-utils.h \
include/gmock/internal/gmock-port.h
@@ -47,7 +37,7 @@ index adc21d7..9366a06 100644
lib_libgmock_main_la_LIBADD = lib/libgmock.la
# Build rules for tests. Automake's naming for some of these variables isn't
-@@ -178,8 +194,8 @@ $(test_gmock_fused_test_SOURCES): fused-gmock-internal
+@@ -178,8 +184,8 @@ $(test_gmock_fused_test_SOURCES): fused-gmock-internal
# TODO(vladl(a)google.com): Find a way to add Google Tests's sources here.
fused-gmock-internal: $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) \
@@ -58,7 +48,7 @@ index adc21d7..9366a06 100644
scripts/fuse_gmock_files.py
mkdir -p "$(srcdir)/fused-src"
chmod -R u+w "$(srcdir)/fused-src"
-@@ -200,10 +216,6 @@ CLEANFILES = core
+@@ -200,10 +206,8 @@ CLEANFILES = core
# Mock can lead to undefined behavior due to violation of the
# One-Definition Rule.
@@ -70,8 +60,10 @@ index adc21d7..9366a06 100644
- echo "'make install' is dangerous and not supported. Instead, see README
for how to integrate Google Mock into your build system."
- false
+install-exec-hook:
-+ mkdir -p $(DESTDIR)$(datadir)/@PACKAGE@
++ mkdir -p $(DESTDIR)$(datadir)/@PACKAGE@ $(DESTDIR)$(prefix)/src/@PACKAGE@
+ cp -rf scripts/generator $(DESTDIR)$(datadir)/@PACKAGE@
++ cp -f src/* $(DESTDIR)$(prefix)/src/@PACKAGE@
++ sed -i s/src[/]//g $(DESTDIR)$(prefix)/src/@PACKAGE(a)/gmock-all.cc
diff --git a/configure.ac b/configure.ac
index e8b65bd..9ec7743 100644
--- a/configure.ac
Show replies by date