aboutsummaryrefslogtreecommitdiff
path: root/lib/googletest
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2024-07-15 04:46:32 +0000
committerWarner Losh <imp@FreeBSD.org>2024-07-15 22:43:39 +0000
commite9ac41698b2f322d55ccf9da50a3596edb2c1800 (patch)
tree557c8263fcf6f394c855ef4458f6fe531563199e /lib/googletest
parentb3877767883e9b26fbcce47c015ba3eab323bf1b (diff)
Diffstat (limited to 'lib/googletest')
-rw-r--r--lib/googletest/Makefile1
-rw-r--r--lib/googletest/Makefile.inc1
-rw-r--r--lib/googletest/gmock/Makefile1
-rw-r--r--lib/googletest/gmock/Makefile.inc1
-rw-r--r--lib/googletest/gmock_main/Makefile1
-rw-r--r--lib/googletest/gmock_main/Makefile.inc1
-rw-r--r--lib/googletest/gtest/Makefile1
-rw-r--r--lib/googletest/gtest/Makefile.inc1
-rw-r--r--lib/googletest/gtest_main/Makefile1
-rw-r--r--lib/googletest/gtest_main/Makefile.inc1
-rw-r--r--lib/googletest/tests/Makefile1
-rw-r--r--lib/googletest/tests/Makefile.inc1
-rw-r--r--lib/googletest/tests/gmock/Makefile1
-rw-r--r--lib/googletest/tests/gmock_main/Makefile1
-rw-r--r--lib/googletest/tests/gtest/Makefile1
-rw-r--r--lib/googletest/tests/gtest_main/Makefile1
16 files changed, 0 insertions, 16 deletions
diff --git a/lib/googletest/Makefile b/lib/googletest/Makefile
index 7b56a6c216d1..2cbc40829d13 100644
--- a/lib/googletest/Makefile
+++ b/lib/googletest/Makefile
@@ -1,4 +1,3 @@
-
.include <src.opts.mk>
SUBDIR+= gtest
diff --git a/lib/googletest/Makefile.inc b/lib/googletest/Makefile.inc
index f40428f77542..231d7545f364 100644
--- a/lib/googletest/Makefile.inc
+++ b/lib/googletest/Makefile.inc
@@ -1,4 +1,3 @@
-
.include <googletest.test.inc.mk>
GTEST_DIR= ${SRCTOP}/contrib/googletest
diff --git a/lib/googletest/gmock/Makefile b/lib/googletest/gmock/Makefile
index b896c789a8bc..b6f8b69e356a 100644
--- a/lib/googletest/gmock/Makefile
+++ b/lib/googletest/gmock/Makefile
@@ -1,4 +1,3 @@
-
.include <bsd.init.mk>
.PATH: ${GOOGLEMOCK_SRCROOT}/include ${GOOGLEMOCK_SRCROOT}/src
diff --git a/lib/googletest/gmock/Makefile.inc b/lib/googletest/gmock/Makefile.inc
index 22f1f7384010..f77e46b3451a 100644
--- a/lib/googletest/gmock/Makefile.inc
+++ b/lib/googletest/gmock/Makefile.inc
@@ -1,2 +1 @@
-
include ../Makefile.inc
diff --git a/lib/googletest/gmock_main/Makefile b/lib/googletest/gmock_main/Makefile
index 4978aa7af4a6..34b87a054269 100644
--- a/lib/googletest/gmock_main/Makefile
+++ b/lib/googletest/gmock_main/Makefile
@@ -1,4 +1,3 @@
-
.include <bsd.init.mk>
.PATH: ${GOOGLEMOCK_SRCROOT}/include ${GOOGLEMOCK_SRCROOT}/src
diff --git a/lib/googletest/gmock_main/Makefile.inc b/lib/googletest/gmock_main/Makefile.inc
index 22f1f7384010..f77e46b3451a 100644
--- a/lib/googletest/gmock_main/Makefile.inc
+++ b/lib/googletest/gmock_main/Makefile.inc
@@ -1,2 +1 @@
-
include ../Makefile.inc
diff --git a/lib/googletest/gtest/Makefile b/lib/googletest/gtest/Makefile
index fbfcfb5e1b3c..6475fd2e0430 100644
--- a/lib/googletest/gtest/Makefile
+++ b/lib/googletest/gtest/Makefile
@@ -1,4 +1,3 @@
-
.include <bsd.init.mk>
.PATH: ${GOOGLETEST_SRCROOT}/include ${GOOGLETEST_SRCROOT}/src
diff --git a/lib/googletest/gtest/Makefile.inc b/lib/googletest/gtest/Makefile.inc
index 22f1f7384010..f77e46b3451a 100644
--- a/lib/googletest/gtest/Makefile.inc
+++ b/lib/googletest/gtest/Makefile.inc
@@ -1,2 +1 @@
-
include ../Makefile.inc
diff --git a/lib/googletest/gtest_main/Makefile b/lib/googletest/gtest_main/Makefile
index 0aea71a41b75..1a4eb5d71393 100644
--- a/lib/googletest/gtest_main/Makefile
+++ b/lib/googletest/gtest_main/Makefile
@@ -1,4 +1,3 @@
-
.include <bsd.init.mk>
.PATH: ${GOOGLETEST_SRCROOT}/include ${GOOGLETEST_SRCROOT}/src
diff --git a/lib/googletest/gtest_main/Makefile.inc b/lib/googletest/gtest_main/Makefile.inc
index 22f1f7384010..f77e46b3451a 100644
--- a/lib/googletest/gtest_main/Makefile.inc
+++ b/lib/googletest/gtest_main/Makefile.inc
@@ -1,2 +1 @@
-
include ../Makefile.inc
diff --git a/lib/googletest/tests/Makefile b/lib/googletest/tests/Makefile
index 8e3299029da0..886b1a2fe49d 100644
--- a/lib/googletest/tests/Makefile
+++ b/lib/googletest/tests/Makefile
@@ -1,4 +1,3 @@
-
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
diff --git a/lib/googletest/tests/Makefile.inc b/lib/googletest/tests/Makefile.inc
index 03ee799eb611..9691aaa93ded 100644
--- a/lib/googletest/tests/Makefile.inc
+++ b/lib/googletest/tests/Makefile.inc
@@ -1,4 +1,3 @@
-
.include "../Makefile.inc"
# Keep the existing tests directory structure (with subdirs per component)
# rather than installing all of them to /usr/tests/lib/googletest
diff --git a/lib/googletest/tests/gmock/Makefile b/lib/googletest/tests/gmock/Makefile
index 5df1f48c0e4a..493567100630 100644
--- a/lib/googletest/tests/gmock/Makefile
+++ b/lib/googletest/tests/gmock/Makefile
@@ -1,4 +1,3 @@
-
.include <bsd.init.mk>
.PATH: ${GOOGLEMOCK_SRCROOT}/src ${GOOGLEMOCK_SRCROOT}/test
diff --git a/lib/googletest/tests/gmock_main/Makefile b/lib/googletest/tests/gmock_main/Makefile
index 7523b585ac2c..1b191924fb9d 100644
--- a/lib/googletest/tests/gmock_main/Makefile
+++ b/lib/googletest/tests/gmock_main/Makefile
@@ -1,4 +1,3 @@
-
.include <bsd.init.mk>
.PATH: ${GOOGLEMOCK_SRCROOT}/src ${GOOGLEMOCK_SRCROOT}/test
diff --git a/lib/googletest/tests/gtest/Makefile b/lib/googletest/tests/gtest/Makefile
index 0000167dfe70..5834ca788985 100644
--- a/lib/googletest/tests/gtest/Makefile
+++ b/lib/googletest/tests/gtest/Makefile
@@ -1,4 +1,3 @@
-
.include <bsd.init.mk>
.PATH: ${GOOGLETEST_SRCROOT}/src ${GOOGLETEST_SRCROOT}/test
diff --git a/lib/googletest/tests/gtest_main/Makefile b/lib/googletest/tests/gtest_main/Makefile
index 3124042f8b95..de9bc2f4a78a 100644
--- a/lib/googletest/tests/gtest_main/Makefile
+++ b/lib/googletest/tests/gtest_main/Makefile
@@ -1,4 +1,3 @@
-
.include <bsd.init.mk>
.PATH: ${GOOGLETEST_SRCROOT}/src ${GOOGLETEST_SRCROOT}/test