|
 |
732bba2 |
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
732bba2 |
Date: Sat, 13 Feb 2016 22:15:38 +0300
|
|
|
732bba2 |
Subject: [PATCH] Removal of bundled gmock/gtest
|
|
|
732bba2 |
|
|
|
732bba2 |
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
732bba2 |
|
|
|
732bba2 |
diff --git a/Makefile.am b/Makefile.am
|
|
|
1990cc9 |
index f8ccdb8..faaa164 100644
|
|
|
732bba2 |
--- a/Makefile.am
|
|
|
732bba2 |
+++ b/Makefile.am
|
|
|
1990cc9 |
@@ -136,38 +136,18 @@ sipp_LDADD = @LIBOBJS@ @GSL_LIBS@
|
|
|
732bba2 |
src/call.cpp: include/version.h
|
|
|
732bba2 |
src/sipp.cpp: include/version.h
|
|
|
732bba2 |
|
|
|
732bba2 |
-gtest_SOURCES = \
|
|
|
732bba2 |
- gtest/src/gtest-death-test.cc \
|
|
|
732bba2 |
- gtest/src/gtest-filepath.cc \
|
|
|
732bba2 |
- gtest/src/gtest-internal-inl.h \
|
|
|
732bba2 |
- gtest/src/gtest-port.cc \
|
|
|
732bba2 |
- gtest/src/gtest-printers.cc \
|
|
|
732bba2 |
- gtest/src/gtest-test-part.cc \
|
|
|
732bba2 |
- gtest/src/gtest-typed-test.cc \
|
|
|
732bba2 |
- gtest/src/gtest.cc \
|
|
|
732bba2 |
- gmock/src/gmock-internal-utils.cc \
|
|
|
732bba2 |
- gmock/src/gmock-matchers.cc
|
|
|
732bba2 |
-
|
|
|
732bba2 |
sipp_unittest_SOURCES = \
|
|
|
732bba2 |
$(common_SOURCES) \
|
|
|
732bba2 |
src/sipp_unittest.cpp \
|
|
|
732bba2 |
- src/xp_parser_ut.cpp \
|
|
|
732bba2 |
- $(gtest_SOURCES)
|
|
|
732bba2 |
+ src/xp_parser_ut.cpp
|
|
|
732bba2 |
|
|
|
732bba2 |
sipp_unittest_CFLAGS = $(AM_CFLAGS) -DGTEST=1 \
|
|
|
732bba2 |
- -I$(srcdir)/gtest/include \
|
|
|
732bba2 |
- -I$(srcdir)/gmock/include \
|
|
|
732bba2 |
- -I$(srcdir)/gtest \
|
|
|
732bba2 |
- -I$(srcdir)/gmock \
|
|
|
732bba2 |
- @GSL_CFLAGS@
|
|
|
732bba2 |
+ @GSL_CFLAGS@ `/usr/bin/gtest-config --cppflags`
|
|
|
732bba2 |
|
|
|
732bba2 |
sipp_unittest_CXXFLAGS = $(AM_CXXFLAGS) -DGTEST=1 \
|
|
|
732bba2 |
- -I$(srcdir)/gtest/include \
|
|
|
732bba2 |
- -I$(srcdir)/gmock/include \
|
|
|
732bba2 |
- -I$(srcdir)/gtest \
|
|
|
732bba2 |
- -I$(srcdir)/gmock \
|
|
|
732bba2 |
- @GSL_CXXFLAGS@
|
|
|
732bba2 |
+ @GSL_CXXFLAGS@ `/usr/bin/gtest-config --cxxflags`
|
|
|
732bba2 |
|
|
|
000ee2f |
+sipp_unittest_LDFLAGS = `/usr/bin/gtest-config --ldflags --libs`
|
|
|
732bba2 |
sipp_unittest_LDADD = @LIBOBJS@ @GSL_LIBS@
|
|
|
732bba2 |
|
|
|
a62bdbe |
# Ensure that after a reconfigure the source is cleaned.
|