X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fext%2FMakefile;h=4ae56cfc3ebbd1c8cf5a0981b2c3c39601292c01;hb=6648fc7e4292a36d17851b48758028f494fd8bd8;hp=58015539d9211434a4e34c487866e1e990d810ba;hpb=812ed39f9da336310e815c361ab5a9f118657d94;p=vpp.git

diff --git a/test/ext/Makefile b/test/ext/Makefile
index 58015539d92..4ae56cfc3eb 100644
--- a/test/ext/Makefile
+++ b/test/ext/Makefile
@@ -4,18 +4,23 @@ VAPI_CPPBIN = $(addprefix $(VAPI_BINDIR), vapi_cpp_test)
 VOM_BINDIR = $(BR)/vom_test/
 VOM_BIN = $(addprefix $(VOM_BINDIR), vom_test)
 
-ifeq ($(filter centos,$(OS_ID)),$(OS_ID))
+ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID))
 VAPI_CPPBIN=
 endif
 
-VAPI_LIBS = -L$(VPP_TEST_BUILD_DIR)/vpp/.libs/ -L$(VPP_TEST_BUILD_DIR)/vpp/vpp-api/vapi/.libs/ -lvppinfra -lvlibmemoryclient -lsvm -lpthread -lcheck -lrt -lm -lvapiclient
-ifneq ($(filter opensuse,$(OS_ID)),$(OS_ID))
+VAPI_LIBS = \
+  -L$(VPP_TEST_INSTALL_PATH)/vpp/lib \
+  -lvppinfra -lvlibmemoryclient -lsvm -lpthread -lcheck -lrt -lm -lvapiclient
+
+ifneq ($(filter centos opensuse opensuse-tumbleweed opensuse-leap,$(OS_ID)),$(OS_ID))
 VAPI_LIBS += -lsubunit
 endif
-CFLAGS = -std=gnu99 -g -Wall -pthread -I$(WS_ROOT)/src -I$(VPP_TEST_INSTALL_PATH)/vpp/include -I$(VAPI_BINDIR)
-CPPFLAGS = -std=c++11 -g -Wall -pthread -I$(WS_ROOT)/src -I$(VPP_TEST_INSTALL_PATH)/vpp/include -I$(VAPI_BINDIR)
 
-all: $(VAPI_CBIN) $(VAPI_CPPBIN) $(VOM_BINDIR) $(VOM_BIN)
+FLAGS = -g -Wall -lstdc++ -pthread -I$(WS_ROOT)/src -I$(VPP_TEST_INSTALL_PATH)/vpp/include -I$(VAPI_BINDIR)
+CFLAGS = -std=gnu99 $(FLAGS)
+CPPFLAGS = -std=c++11 $(FLAGS) -I$(WS_ROOT)/extras/vom
+
+all: $(VAPI_CBIN) $(VAPI_CPPBIN) $(VOM_BIN)
 
 $(VAPI_BINDIR):
 	mkdir -p $(VAPI_BINDIR)
@@ -28,30 +33,54 @@ $(VAPI_BINDIR)/fake.api.vapi.h: fake.api.json $(WS_ROOT)/src/vpp-api/vapi/vapi_c
 $(VAPI_BINDIR)/fake.api.vapi.hpp: fake.api.json $(WS_ROOT)/src/vpp-api/vapi/vapi_cpp_gen.py | $(VAPI_BINDIR)
 	$(WS_ROOT)/src/vpp-api/vapi/vapi_cpp_gen.py --prefix $(VAPI_BINDIR) $<
 
-$(VAPI_CBIN): $(CSRC) $(VPP_TEST_BUILD_DIR)/vpp/vpp-api/vapi/.libs/libvapiclient.so $(VPP_TEST_BUILD_DIR)/vpp/.libs/libvppinfra.so $(VPP_TEST_BUILD_DIR)/vpp/.libs/libvlibmemoryclient.so $(VPP_TEST_BUILD_DIR)/vpp/.libs/libsvm.so $(VAPI_BINDIR)/fake.api.vapi.h
+$(VAPI_CBIN): $(CSRC) $(VAPI_BINDIR)/fake.api.vapi.h
 	$(CC) -o $@ $(CFLAGS) $(CSRC) $(VAPI_LIBS)
 
+$(VAPI_CBIN).d: $(CSRC) $(VAPI_BINDIR)/fake.api.vapi.h
+	$(CC) -o $@ $(CFLAGS) -MM -MT '$(VAPI_CBIN)' $(CSRC) > $@
+
+
 CPPSRC = vapi_cpp_test.cpp
 
-$(VAPI_CPPBIN): $(CPPSRC) $(VPP_TEST_BUILD_DIR)/vpp/vpp-api/vapi/.libs/libvapiclient.so $(VPP_TEST_BUILD_DIR)/vpp/.libs/libvppinfra.so $(VPP_TEST_BUILD_DIR)/vpp/.libs/libvlibmemoryclient.so $(VPP_TEST_BUILD_DIR)/vpp/.libs/libsvm.so $(VAPI_BINDIR)/fake.api.vapi.hpp
+$(VAPI_CPPBIN): $(CPPSRC) $(VAPI_BINDIR)/fake.api.vapi.hpp
 	$(CXX) -o $@ $(CPPFLAGS) $(CPPSRC) $(VAPI_LIBS)
 
+$(VAPI_CPPBIN).d: $(CPPSRC) $(VAPI_BINDIR)/fake.api.vapi.hpp
+	$(CXX) -o $@ $(CPPFLAGS) -MM -MT '$(VAPI_CPPBIN)' $(CPPSRC) > $@
+
 VOM_CPPSRC = vom_test.cpp
 
 $(VOM_BINDIR):
 	mkdir -p $(VOM_BINDIR)
 
-LIB_VOM = $(VPP_TEST_BUILD_DIR)/vpp/vpp-api/vom/.libs/libvom.so
-VOM_LIBS = $(LIB_VOM) 	\
-	-lboost_log					\
+LIB_VOM = -lvom
+VOM_LIBS = \
+	-L$(VPP_TEST_INSTALL_PATH)/vom/lib \
+	-lvom						\
 	-lboost_thread					\
 	-lboost_system					\
 	-lboost_filesystem				\
 	-lboost_unit_test_framework			\
 	$(VAPI_LIBS)
 
-$(VOM_BIN): $(VOM_CPPSRC) $(VOM_BINDIR) $(LIB_VOM) $(VPP_TEST_BUILD_DIR)/vpp/vpp-api/vapi/.libs/libvapiclient.so
-	$(CXX) -o $@ $(CPPFLAGS) -DBOOST_LOG_DYN_LINK -O0 -g $(VOM_CPPSRC) $(VOM_LIBS)
+VOM_CPPFLAGS = \
+	-I $(WS_ROOT)/src/vpp-api/ \
+	-DBOOST_LOG_DYN_LINK \
+	$(CPPFLAGS)
+
+$(VOM_BIN): $(VOM_CPPSRC) $(VOM_BINDIR)
+	$(CXX) -o $@ $(VOM_CPPFLAGS) -O0 -g $(VOM_CPPSRC) $(VOM_LIBS) -Wl,-rpath,$(VPP_TEST_INSTALL_PATH)/vom/lib
+
+$(VOM_BIN).d: $(VOM_CPPSRC) $(VOM_BINDIR)
+	$(CXX) -o $@ $(VOM_CPPFLAGS) -MM -MT '$(VOM_BIN)' $(VOM_CPPSRC) > $@
+
 
 clean:
 	rm -rf $(VAPI_BINDIR) $(VOM_BINDIR)
+
+ifneq ($(MAKECMDGOALS),clean)
+-include $(VAPI_CPPBIN).d
+-include $(VAPI_CBIN).d
+-include $(VOM_BIN).d
+endif
+