From 8d7072632168e1a1887e173509e8efbb5f43f6da Mon Sep 17 00:00:00 2001 From: "Laszlo Boszormenyi (GCS)" Date: Tue, 24 Mar 2020 18:20:00 +0000 Subject: [PATCH] don't compile third_party source Forwarded: not-needed Last-Update: 2019-08-06 Gbp-Pq: Name no_thirdparty.patch --- Makefile.am | 2 +- configure.ac | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index f0ac83f..d389454 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,7 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = . src # Always include third_party directories in distributions. -DIST_SUBDIRS = src conformance benchmarks third_party/googletest +DIST_SUBDIRS = src conformance benchmarks # Build gmock before we build protobuf tests. We don't add gmock to SUBDIRS # because then "make check" would also build and run all of gmock's own tests, diff --git a/configure.ac b/configure.ac index a86499a..df1bae5 100644 --- a/configure.ac +++ b/configure.ac @@ -228,7 +228,6 @@ AM_CONDITIONAL([OBJC_CONFORMANCE_TEST], [test $OBJC_CONFORMANCE_TEST = 1]) # too. export CFLAGS export CXXFLAGS -AC_CONFIG_SUBDIRS([third_party/googletest]) AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc]) AC_OUTPUT -- 2.30.2