diff options
| author | Patrick Venture <venture@google.com> | 2018-06-22 08:18:19 -0700 |
|---|---|---|
| committer | Patrick Venture <venture@google.com> | 2018-06-22 08:18:19 -0700 |
| commit | 2e3ecb57281eec4b73934d639b02273d4f2dd193 (patch) | |
| tree | 7ac39cc4823730d4e4a30360d2cfb742d85aecdc /test | |
| parent | ab28cb34e9bbcf461b9fa2bacda43d484b26f726 (diff) | |
| download | phosphor-pid-control-2e3ecb57281eec4b73934d639b02273d4f2dd193.tar.gz phosphor-pid-control-2e3ecb57281eec4b73934d639b02273d4f2dd193.zip | |
update configure and test/Makefile.am
Update configure.ac and test/Makefile.am to properly handle
newer googletest, per gerrit/11203.
Change-Id: Idcef3d81ff834457fcdc6e0aa1be76b98c64b54c
Signed-off-by: Patrick Venture <venture@google.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 2a51c00..7fdbaf5 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,12 +1,11 @@ AM_CPPFLAGS = -I$(top_srcdir)/ $(GTEST_CFLAGS) $(GMOCK_CFLAGS) -AM_CXXFLAGS = $(PTHREAD_CFLAGS) \ - $(GTEST_CFLAGS) \ - $(GMOCK_CFLAGS) \ +AM_CXXFLAGS = \ + $(GTEST_MAIN_CFLAGS) \ $(SDBUSPLUS_CFLAGS) \ $(PHOSPHOR_DBUS_INTERFACES_CFLAGS) -AM_LDFLAGS = $(GTEST_LIBS) \ - $(PTHREAD_LIBS) \ +AM_LDFLAGS = \ $(GMOCK_LIBS) \ + $(GTEST_MAIN_LIBS) \ $(OESDK_TESTCASE_FLAGS) \ $(SDBUSPLUS_LIBS) \ $(PHOSPHOR_DBUS_INTERFACES_LIBS) |
