From 259109640bc7d91d41aa5217f57c33f6e1f8682f Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 20 七月 2020 11:35:45 +0800
Subject: [PATCH] remove_queues_exclude

---
 queue/Makefile |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/queue/Makefile b/queue/Makefile
index c9a9e38..94f15c8 100644
--- a/queue/Makefile
+++ b/queue/Makefile
@@ -2,9 +2,9 @@
 # Makefile for common library.
 #
 ROOT=..
-#LDLIBS+=-Wl,-rpath=$(ROOT)/common:$(ROOT)/lib/jsoncpp
+LDLIBS+=-Wl,-rpath=$(ROOT)/lib
 # 寮�婧愬伐鍏峰寘璺緞
-#LDDIR += -L$(ROOT)/lib/jsoncpp -L$(ROOT)/lib/nng
+LDDIR += -L$(ROOT)/lib
 
 # 寮�婧愬伐鍏峰寘
 LDLIBS += -lusgcommon
@@ -22,6 +22,12 @@
 
 MYLIBS = $(LIBSQUEUE) $(DLIBSQUEUE)
 
+ifeq ($(DEBUG),y)
+  MYLIBS = $(LIBSQUEUE)
+else
+  MYLIBS = $(LIBSQUEUE) $(DLIBSQUEUE)
+endif
+
 all: build
  
 
@@ -29,13 +35,14 @@
 
 #static lib
 $(LIBSQUEUE): $(OBJS)
-	$(AR) rv $@ $? $(ROOT)/lib/libusgcommon.a
+	$(AR) rv $@ $?
 	$(RANLIB) $@
 
 #dynamic lib
 $(DLIBSQUEUE): $(SOURCES)
 	rm -f *.o
-	$(CC) -fPIC -shared $(CFLAGS) $^ -o $@ $(LDFLAGS) $(ROOT)/lib/libusgcommon.so
+	$(CC) -fPIC -shared $(CFLAGS) $(LDFLAGS) $^ -o $@ 
+	#$(CC) -fPIC -shared $(CFLAGS) $(LDFLAGS)  -o $@ $^ -Wl,--whole-archive $(ROOT)/lib/libusgcommon.a -Wl,--no-whole-archive 
 
 
 #PREFIX is environment variable, but if it is not set, then set default value

--
Gitblit v1.8.0