From 05147156934e18701908c454141feaa7d367f06b Mon Sep 17 00:00:00 2001 From: agibert Date: Thu, 23 Jan 2003 00:24:36 +0000 Subject: [PATCH] Add lib subdir to libver, Change _LIBVER_SUPPORT by LIBVER_SUPPORT, Fix unexported local symbols by adding -rdynamic flag in linking. --- util/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/util/Makefile b/util/Makefile index cc43fc2..2ecc673 100644 --- a/util/Makefile +++ b/util/Makefile @@ -1,18 +1,18 @@ -ifdef _LIBVER_SUPPORT - DEP_STATIC += ../../libver/ver.h ../../libver/libver.a - DEP_DYNAMIC += ../../libver/ver.h ../../libver/libver.so - INCLUDE += -I ../../libver - LIBDIR += -L ../../libver +ifdef LIBVER_SUPPORT + DEP_STATIC += ../../libver/lib/ver.h ../../libver/lib/libver.a + DEP_DYNAMIC += ../../libver/lib/ver.h ../../libver/lib/libver.so + INCLUDE += -I ../../libver/lib + LIBDIR += -L ../../libver/lib ifeq ($(OSTYPE),linux-gnu) - LIB_STATIC += ../../libver/libver.a + LIB_STATIC += ../../libver/lib/libver.a LIB_DYNAMIC += -lver else - LIB_STATIC += -ldl ../../libver/libver.a + LIB_STATIC += -ldl ../../libver/lib/libver.a LIB_DYNAMIC += -ldl -lver endif - FLAG_VER = -D_LIBVER_SUPPORT + FLAG_VER = -D_LIBVER_SUPPORT -rdynamic endif all: ndbench ndbench-static