Imported Upstream version 0.6.7

2 files changed, 45 insertions, 7 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e7e40a8a..4792c3a7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -36,9 +36,9 @@ test_promotion_set.o test_resolver_costs.o test_resolver_hints.o: $(top_srcdir)/
 if BUILD_LOCAL_GMOCK
 noinst_LIBRARIES = libgmock.a
 
-GMOCK_LDFLAGS = $(builddir)/libgmock.a -lgtest
-nodist_libgmock_a_SOURCES = /usr/src/gmock/src/gmock-all.cc
-libgmock_a_CPPFLAGS = -I/usr/src/gmock
+GMOCK_LDFLAGS = $(builddir)/libgmock.a
+nodist_libgmock_a_SOURCES = /usr/src/gtest/src/gtest-all.cc /usr/src/gmock/src/gmock-all.cc
+libgmock_a_CPPFLAGS = -I/usr/src/gtest -I/usr/src/gmock
 else
 GMOCK_LDFLAGS = -lgmock -lgtest
 endif
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 1ef57f07..35abfdfb 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17,6 +17,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -62,6 +79,7 @@ ARFLAGS = cru
 libgmock_a_AR = $(AR) $(ARFLAGS)
 libgmock_a_LIBADD =
 @BUILD_LOCAL_GMOCK_TRUE@nodist_libgmock_a_OBJECTS =  \
+@BUILD_LOCAL_GMOCK_TRUE@	libgmock_a-gtest-all.$(OBJEXT) \
 @BUILD_LOCAL_GMOCK_TRUE@	libgmock_a-gmock-all.$(OBJEXT)
 libgmock_a_OBJECTS = $(nodist_libgmock_a_OBJECTS)
 PROGRAMS = $(noinst_PROGRAMS)
@@ -167,6 +185,11 @@ SOURCES = $(nodist_libgmock_a_SOURCES) $(boost_test_SOURCES) \
 	$(interactive_set_test_SOURCES)
 DIST_SOURCES = $(boost_test_SOURCES) $(cppunit_test_SOURCES) \
 	$(gtest_test_SOURCES) $(interactive_set_test_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 ETAGS = etags
 CTAGS = ctags
 am__tty_colors = \
@@ -345,9 +368,9 @@ interactive_set_test_SOURCES = interactive_set_test.cc
 # Build a local copy of gmock if necessary.
 @BUILD_LOCAL_GMOCK_TRUE@noinst_LIBRARIES = libgmock.a
 @BUILD_LOCAL_GMOCK_FALSE@GMOCK_LDFLAGS = -lgmock -lgtest
-@BUILD_LOCAL_GMOCK_TRUE@GMOCK_LDFLAGS = $(builddir)/libgmock.a -lgtest
-@BUILD_LOCAL_GMOCK_TRUE@nodist_libgmock_a_SOURCES = /usr/src/gmock/src/gmock-all.cc
-@BUILD_LOCAL_GMOCK_TRUE@libgmock_a_CPPFLAGS = -I/usr/src/gmock
+@BUILD_LOCAL_GMOCK_TRUE@GMOCK_LDFLAGS = $(builddir)/libgmock.a
+@BUILD_LOCAL_GMOCK_TRUE@nodist_libgmock_a_SOURCES = /usr/src/gtest/src/gtest-all.cc /usr/src/gmock/src/gmock-all.cc
+@BUILD_LOCAL_GMOCK_TRUE@libgmock_a_CPPFLAGS = -I/usr/src/gtest -I/usr/src/gmock
 
 # Note: test_apt_universe is not built by default because it takes way
 # too long.  Of course, ideally this would be done in a less ad-hoc
@@ -463,6 +486,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtest_test_main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interactive_set_test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgmock_a-gmock-all.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgmock_a-gtest-all.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_choice.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_choice_set.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cmdline_download_progress_display.Po@am__quote@
@@ -508,6 +532,20 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
+libgmock_a-gtest-all.o: /usr/src/gtest/src/gtest-all.cc
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgmock_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libgmock_a-gtest-all.o -MD -MP -MF $(DEPDIR)/libgmock_a-gtest-all.Tpo -c -o libgmock_a-gtest-all.o `test -f '/usr/src/gtest/src/gtest-all.cc' || echo '$(srcdir)/'`/usr/src/gtest/src/gtest-all.cc
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libgmock_a-gtest-all.Tpo $(DEPDIR)/libgmock_a-gtest-all.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='/usr/src/gtest/src/gtest-all.cc' object='libgmock_a-gtest-all.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgmock_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libgmock_a-gtest-all.o `test -f '/usr/src/gtest/src/gtest-all.cc' || echo '$(srcdir)/'`/usr/src/gtest/src/gtest-all.cc
+
+libgmock_a-gtest-all.obj: /usr/src/gtest/src/gtest-all.cc
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgmock_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libgmock_a-gtest-all.obj -MD -MP -MF $(DEPDIR)/libgmock_a-gtest-all.Tpo -c -o libgmock_a-gtest-all.obj `if test -f '/usr/src/gtest/src/gtest-all.cc'; then $(CYGPATH_W) '/usr/src/gtest/src/gtest-all.cc'; else $(CYGPATH_W) '$(srcdir)//usr/src/gtest/src/gtest-all.cc'; fi`
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libgmock_a-gtest-all.Tpo $(DEPDIR)/libgmock_a-gtest-all.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='/usr/src/gtest/src/gtest-all.cc' object='libgmock_a-gtest-all.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgmock_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libgmock_a-gtest-all.obj `if test -f '/usr/src/gtest/src/gtest-all.cc'; then $(CYGPATH_W) '/usr/src/gtest/src/gtest-all.cc'; else $(CYGPATH_W) '$(srcdir)//usr/src/gtest/src/gtest-all.cc'; fi`
+
 libgmock_a-gmock-all.o: /usr/src/gmock/src/gmock-all.cc
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgmock_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libgmock_a-gmock-all.o -MD -MP -MF $(DEPDIR)/libgmock_a-gmock-all.Tpo -c -o libgmock_a-gmock-all.o `test -f '/usr/src/gmock/src/gmock-all.cc' || echo '$(srcdir)/'`/usr/src/gmock/src/gmock-all.cc
 @am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libgmock_a-gmock-all.Tpo $(DEPDIR)/libgmock_a-gmock-all.Po