$OpenBSD: patch-src_Makefile_in,v 1.5 2018/08/09 14:50:10 tb Exp $

Index: src/Makefile.in
--- src/Makefile.in.orig
+++ src/Makefile.in
@@ -475,10 +475,7 @@ protobuf_lazy_descriptor_test_OBJECTS =  \
 	$(am_protobuf_lazy_descriptor_test_OBJECTS) \
 	$(nodist_protobuf_lazy_descriptor_test_OBJECTS)
 protobuf_lazy_descriptor_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	libprotobuf.la libprotoc.la \
-	$(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
-	$(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
-	$(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
+	libprotobuf.la libprotoc.la
 protobuf_lazy_descriptor_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 	$(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) \
@@ -498,9 +495,7 @@ protobuf_lite_arena_test_OBJECTS =  \
 	$(am_protobuf_lite_arena_test_OBJECTS) \
 	$(nodist_protobuf_lite_arena_test_OBJECTS)
 protobuf_lite_arena_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	libprotobuf-lite.la $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
-	$(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
-	$(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
+	libprotobuf-lite.la
 protobuf_lite_arena_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 	$(protobuf_lite_arena_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
@@ -521,9 +516,7 @@ nodist_protobuf_lite_test_OBJECTS = $(am__objects_10)
 protobuf_lite_test_OBJECTS = $(am_protobuf_lite_test_OBJECTS) \
 	$(nodist_protobuf_lite_test_OBJECTS)
 protobuf_lite_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	libprotobuf-lite.la $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
-	$(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
-	$(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
+	libprotobuf-lite.la
 protobuf_lite_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 	$(protobuf_lite_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
@@ -660,9 +653,7 @@ nodist_protobuf_test_OBJECTS = $(am__objects_13)
 protobuf_test_OBJECTS = $(am_protobuf_test_OBJECTS) \
 	$(nodist_protobuf_test_OBJECTS)
 protobuf_test_DEPENDENCIES = $(am__DEPENDENCIES_1) libprotobuf.la \
-	libprotoc.la $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
-	$(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
-	$(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
+	libprotoc.la
 protobuf_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 	$(protobuf_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
@@ -676,7 +667,7 @@ am_test_plugin_OBJECTS = google/protobuf/compiler/test
 	google/protobuf/compiler/test_plugin-test_plugin.$(OBJEXT)
 test_plugin_OBJECTS = $(am_test_plugin_OBJECTS)
 test_plugin_DEPENDENCIES = $(am__DEPENDENCIES_1) libprotobuf.la \
-	libprotoc.la $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la
+	libprotoc.la
 am__zcgunzip_SOURCES_DIST = google/protobuf/testing/zcgunzip.cc
 @HAVE_ZLIB_TRUE@am_zcgunzip_OBJECTS =  \
 @HAVE_ZLIB_TRUE@	google/protobuf/testing/zcgunzip.$(OBJEXT)
@@ -701,7 +692,7 @@ AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I${LOCALBASE}/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
@@ -1850,12 +1841,9 @@ GOOGLEMOCK_BUILD_DIR = ../third_party/googletest/googl
 GOOGLETEST_SRC_DIR = $(srcdir)/../third_party/googletest/googletest
 GOOGLEMOCK_SRC_DIR = $(srcdir)/../third_party/googletest/googlemock
 protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
-                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la     \
-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la     \
-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
+		      -L${LOCALBASE}/lib -lgtest -lgmock -lgmock_main
 
-protobuf_test_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include \
-                         -I$(GOOGLEMOCK_SRC_DIR)/include
+protobuf_test_CPPFLAGS = -I${LOCALBASE}/include
 
 # Disable optimization for tests unless the user explicitly asked for it,
 # since test_util.cc takes forever to compile with optimization (with GCC).
@@ -1944,12 +1932,9 @@ nodist_protobuf_test_SOURCES = $(protoc_outputs)
 # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
 protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
                       libprotoc.la                                   \
-                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la        \
-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la        \
-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
+		      -L${LOCALBASE}/lib -lgtest -lgmock -lgmock_main
 
-protobuf_lazy_descriptor_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \
-                                         -I$(GOOGLETEST_SRC_DIR)/include \
+protobuf_lazy_descriptor_test_CPPFLAGS = -I${LOCALBASE}/include          \
                                          -DPROTOBUF_TEST_NO_DESCRIPTORS
 
 protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
@@ -1972,12 +1957,9 @@ COMMON_LITE_TEST_SOURCES = \
 # full runtime and we want to make sure this test builds without full
 # runtime.
 protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la     \
-                           $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
-                           $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
-                           $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
+			   -L${LOCALBASE}/lib -lgtest -lgmock -lgmock_main
 
-protobuf_lite_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \
-                             -I$(GOOGLETEST_SRC_DIR)/include
+protobuf_lite_test_CPPFLAGS = -I${LOCALBASE}/include
 
 protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
 protobuf_lite_test_SOURCES = \
@@ -1990,12 +1972,9 @@ nodist_protobuf_lite_test_SOURCES = $(protoc_lite_outp
 # gtest when building the test internally our memory sanitizer doesn't detect
 # memory leaks (don't know why).
 protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
-                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la        \
-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la        \
-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
+				 -L${LOCALBASE}/lib -lgtest -lgmock -lgmock_main
 
-protobuf_lite_arena_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include  \
-                                    -I$(GOOGLETEST_SRC_DIR)/include
+protobuf_lite_arena_test_CPPFLAGS = -I${LOCALBASE}/include
 
 protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
 protobuf_lite_arena_test_SOURCES = \
@@ -2006,9 +1985,9 @@ nodist_protobuf_lite_arena_test_SOURCES = $(protoc_lit
 
 # Test plugin binary.
 test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
-                    $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la
+		    -L${LOCALBASE}/lib -lgtest -lgmock -lgmock_main
 
-test_plugin_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include
+test_plugin_CPPFLAGS = -I${$LOCALBASE}/include
 test_plugin_SOURCES = \
   google/protobuf/compiler/mock_code_generator.cc              \
   google/protobuf/testing/file.cc                              \
