aboutsummaryrefslogtreecommitdiffstats
path: root/test/ext/Makefile
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2018-09-12 14:01:10 +0200
committerDave Barach <openvpp@barachs.net>2018-09-12 16:38:59 +0000
commit79dcbc74cd417f4caf41bc398ccba94cab7d656b (patch)
tree043a57b2a904636093ff08b44f97172d09c36114 /test/ext/Makefile
parent350155329c6075cef48b2d6934329a7ad75cf5c8 (diff)
Always use 'lib' instead of 'lib64'
It is packaging responsibility to put libs in the right place. Use of lib64 resulted in huge amount of files with hardcoded lib64. This patch simplifies things... Change-Id: Iab0dea0583e480907732c5d2379eb951a00fa9e6 Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'test/ext/Makefile')
-rw-r--r--test/ext/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/ext/Makefile b/test/ext/Makefile
index a66a72c35dc..4ae56cfc3eb 100644
--- a/test/ext/Makefile
+++ b/test/ext/Makefile
@@ -9,7 +9,7 @@ VAPI_CPPBIN=
endif
VAPI_LIBS = \
- -L$(VPP_TEST_INSTALL_PATH)/vpp/lib64 \
+ -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))
@@ -55,7 +55,7 @@ $(VOM_BINDIR):
LIB_VOM = -lvom
VOM_LIBS = \
- -L$(VPP_TEST_INSTALL_PATH)/vom/lib64 \
+ -L$(VPP_TEST_INSTALL_PATH)/vom/lib \
-lvom \
-lboost_thread \
-lboost_system \
@@ -69,7 +69,7 @@ VOM_CPPFLAGS = \
$(CPPFLAGS)
$(VOM_BIN): $(VOM_CPPSRC) $(VOM_BINDIR)
- $(CXX) -o $@ $(VOM_CPPFLAGS) -O0 -g $(VOM_CPPSRC) $(VOM_LIBS) -Wl,-rpath,$(VPP_TEST_INSTALL_PATH)/vom/lib64
+ $(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) > $@