@@ -21,17 +21,19 @@ KCTLDIR = $(TLD)/toolbox/kctl
21
21
BKVDIR = $(TLD ) /toolbox/bkv
22
22
LISTDIR = $(TLD ) /vendor/list
23
23
PROTOBUFDIR = $(TLD ) /vendor/protobuf-c
24
- GTESTDIR = $(TLD ) /vendor/googletest
25
24
SRCDIR = $(TLD ) /src
26
25
TBDIR = $(TLD ) /toolbox
27
- TESTDIR = $(TLD ) /tests
28
26
29
27
LPROTOBUF = $(BUILDLIB ) /libprotobuf-c.so
30
28
LLIST = $(BUILDLIB ) /liblist.a
31
29
LKINETIC = $(BUILDLIB ) /libkinetic.a
32
- LGTEST = $(BUILDLIB ) /libgtest.a
33
30
KCTL = $(BUILDBIN ) /kctl
34
31
32
+ # These are being deprecated for now
33
+ # TESTDIR = $(TLD)/tests
34
+ # GTESTDIR = $(TLD)/vendor/googletest
35
+ # LGTEST = $(BUILDLIB)/libgtest.a
36
+
35
37
CC = gcc
36
38
CFLAGS = -g -I$(BUILDDIR ) /include
37
39
LDFLAGS = -L$(BUILDDIR ) /lib
@@ -48,8 +50,6 @@ DISTFILES = \
48
50
49
51
all : $(BUILDDIR ) $(LPROTOBUF ) $(LLIST ) $(LKINETIC ) $(TBDIR ) # $(TESTDIR) $(LGTEST)
50
52
51
- test : $(TESTDIR )
52
-
53
53
dist : all
54
54
@ ( \
55
55
cd $(BUILDDIR ) ; \
@@ -69,9 +69,6 @@ $(BUILDDIR):
69
69
$(TBDIR ) : FORCE
70
70
(cd $@ ; BUILDDIR=$( BUILDDIR) make -e all install)
71
71
72
- $(TESTDIR ) : FORCE
73
- (cd $@ ; BUILDDIR=$( BUILDDIR) make -e all install)
74
-
75
72
$(LPROTOBUF ) :
76
73
(cd $( PROTOBUFDIR) ; [ ! -f ./configure ] && ./autogen.sh; true)
77
74
(cd $( PROTOBUFDIR) ; [ ! -f ./Makefile ] && ./configure --prefix=$( BUILDDIR) ; true)
@@ -84,10 +81,6 @@ $(LLIST):
84
81
$(LKINETIC ) : FORCE
85
82
(cd $( SRCDIR) ; BUILDDIR=$( BUILDDIR) make -e all install)
86
83
87
- $(LGTEST ) : FORCE
88
- (cd $( GTESTDIR) ; BUILDDIR=$( BUILDDIR) bazel build gtest)
89
- /usr/bin/install -c -m 755 $(GTESTDIR ) /bazel-bin/libgtest.a $(BUILDLIB )
90
-
91
84
# The sanity target only works if you have a kineticd server running locally.
92
85
sanity :
93
86
(cd $( KCTLDIR) ; make all sanity)
@@ -108,24 +101,38 @@ listclean:
108
101
kineticclean :
109
102
(cd $( SRCDIR) ; make clean)
110
103
111
- gtestclean :
112
- (cd $( GTESTDIR) ; bazel clean)
113
-
114
104
toolboxclean :
115
105
(cd $( TBDIR) ; make clean)
116
106
117
- testclean :
118
- (cd $( TESTDIR) ; make clean)
119
-
120
107
distclean :
121
108
(cd $( PROTOBUFDIR) ; [ -f ./Makefile ] && make distclean; true)
122
109
(cd $( LISTDIR) ; make clean)
123
110
(cd $( SRCDIR) ; make clean)
124
- (cd $( GTESTDIR) ; bazel clean)
125
111
(cd $( TBDIR) ; make clean)
126
- (cd $( TESTDIR) ; make clean)
112
+ # (cd $(TESTDIR); make clean)
113
+ # (cd $(GTESTDIR); bazel clean)
127
114
rm -rf $(BUILDDIR )
128
115
129
116
.PHONY : FORCE
130
117
FORCE :
131
118
119
+
120
+ # ------------------------------
121
+ # Deprecated portions, here for reference (and to make bringing it back in the future easier)
122
+
123
+ # We are deprecating googletest unit tests for now
124
+ # $(LGTEST): FORCE
125
+ # (cd $(GTESTDIR); BUILDDIR=$(BUILDDIR) bazel build gtest)
126
+ # /usr/bin/install -c -m 755 $(GTESTDIR)/bazel-bin/libgtest.a $(BUILDLIB)
127
+
128
+ # gtestclean:
129
+ # (cd $(GTESTDIR); bazel clean)
130
+
131
+ # Deprecating the test directory, which will only contain google tests
132
+ # test: $(TESTDIR)
133
+
134
+ # $(TESTDIR): FORCE
135
+ # (cd $@; BUILDDIR=$(BUILDDIR) make -e all install)
136
+
137
+ # testclean:
138
+ # (cd $(TESTDIR); make clean)
0 commit comments