From 634f5da8c988a5e83edfb5053260ea110bce337d Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 20 七月 2020 18:28:20 +0800
Subject: [PATCH] 解决冲突

---
 queue/Makefile |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/queue/Makefile b/queue/Makefile
index c18e39a..3c8a4e2 100644
--- a/queue/Makefile
+++ b/queue/Makefile
@@ -2,12 +2,12 @@
 # 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 += -ljsoncpp  -lnng  -lpthread
+LDLIBS += -lusgcommon
 
 #INCLUDE += -I$(ROOT)/device/include
 
@@ -20,7 +20,13 @@
 SOURCES := $(wildcard *.c)
 OBJS   = $(patsubst %.c, %.o, $(SOURCES)) 
 
-MYLIBS = $(LIBSQUEUE)
+MYLIBS = $(LIBSQUEUE) $(DLIBSQUEUE)
+
+ifeq ($(DEBUG),y)
+  MYLIBS = $(LIBSQUEUE)
+else
+  MYLIBS = $(LIBSQUEUE) $(DLIBSQUEUE)
+endif
 
 all: build
  
@@ -35,7 +41,7 @@
 #dynamic lib
 $(DLIBSQUEUE): $(SOURCES)
 	rm -f *.o
-	$(CC) -fPIC -shared $(CFLAGS) $^ -o $@ $(LDFLAGS)
+	$(CC) -fPIC -shared $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
 
 
 #PREFIX is environment variable, but if it is not set, then set default value

--
Gitblit v1.8.0