forked from Lainports/opnsense-ports
48 lines
1.3 KiB
Text
48 lines
1.3 KiB
Text
--- Makefile.am.orig 2016-02-02 11:35:23 UTC
|
|
+++ Makefile.am
|
|
@@ -3,7 +3,6 @@ ACLOCAL_AMFLAGS = -Im4
|
|
AM_CPPFLAGS = \
|
|
-I$(GMOCK_DIR)/include \
|
|
-I$(GTEST_DIR)/include \
|
|
- -Ithird_party/objecthash \
|
|
$(evhtp_CFLAGS) \
|
|
$(icu_CFLAGS) \
|
|
$(json_c_CFLAGS)
|
|
@@ -12,8 +11,6 @@ AM_CXXFLAGS = \
|
|
-fno-exceptions
|
|
|
|
BUILT_SOURCES = \
|
|
- cpp/gmock-all.cc \
|
|
- cpp/gtest-all.cc \
|
|
cpp/monitoring/prometheus/metrics.pb.cc \
|
|
cpp/monitoring/prometheus/metrics.pb.h \
|
|
proto/ct.pb.cc \
|
|
@@ -124,9 +121,6 @@ endif
|
|
cpp/gtest-all.cc: $(GTEST_DIR)/src/gtest-all.cc
|
|
$(AM_V_at)cp $^ $@
|
|
|
|
-cpp/gmock-all.cc: $(GMOCK_DIR)/src/gmock-all.cc
|
|
- $(AM_V_at)cp $^ $@
|
|
-
|
|
test/testdata/urlfetcher_test_certs/localhost-key.pem: test/create_url_fetcher_test_certs.sh
|
|
$(AM_V_GEN)test/create_url_fetcher_test_certs.sh
|
|
|
|
@@ -215,8 +209,6 @@ cpp_libtest_a_CPPFLAGS = \
|
|
-I$(GTEST_DIR) \
|
|
$(AM_CPPFLAGS)
|
|
cpp_libtest_a_SOURCES = \
|
|
- cpp/gmock-all.cc \
|
|
- cpp/gtest-all.cc \
|
|
cpp/util/testing.cc
|
|
|
|
cpp_server_ct_mirror_LDADD = \
|
|
@@ -297,8 +289,7 @@ cpp_server_xjson_server_SOURCES = \
|
|
cpp/server/server_helper.cc \
|
|
cpp/server/xjson-server.cc \
|
|
cpp/server/x_json_handler.cc \
|
|
- cpp/util/json_wrapper.cc \
|
|
- third_party/objecthash/objecthash.cc
|
|
+ cpp/util/json_wrapper.cc
|
|
|
|
cpp_tools_ct_clustertool_LDADD = \
|
|
cpp/libcore.a \
|