From 9b2d472b92665ab6afac8dcca9683c759b3fbb8a Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 30 六月 2020 17:41:41 +0800
Subject: [PATCH] update

---
 service/Makefile |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/service/Makefile b/service/Makefile
index 9fa2483..0d94dca 100644
--- a/service/Makefile
+++ b/service/Makefile
@@ -2,29 +2,40 @@
 # Makefile for common library.
 #
 ROOT=..
-LDLIBS+=-Wl,-rpath=$(ROOT)/hclib:$(ROOT)/hclib/HCNetSDKCom:$(ROOT)/common:$(ROOT)/device
-LDDIR += -L$(ROOT)/device -L$(ROOT)/hclib -L$(ROOT)/hclib/HCNetSDKCom
-LDLIBS += -lnetdisk
-LDLIBS +=  -lhcnetsdk -lhpr -lHCCore 
+LDLIBS+=-Wl,-rpath=$(ROOT)/lib/hc:$(ROOT)/lib/hc/HCNetSDKCom:$(ROOT)/common:$(ROOT)/lib/jsoncpp
+# 娴峰悍鍖呰矾寰�
+LDDIR += -L$(ROOT)/lib/hc -L$(ROOT)/lib/hc/HCNetSDKCom
+# 寮�婧愬伐鍏峰寘璺緞
+LDDIR += -L$(ROOT)/lib/jsoncpp -L$(ROOT)/lib/nng
+
+# 娴峰悍鍖�
+LDLIBS +=  -lhcnetsdk -lhpr -lHCCore
+# 寮�婧愬伐鍏峰寘
 LDLIBS += -ljsoncpp  -lnng  -lpthread
 
 INCLUDE += -I$(ROOT)/device/include
-LIB_NETDISK = $(ROOT)/libnetdisk.a
-DLIB_NETDISK = $(ROOT)/libnetdisk.so
+#LIB_NETDISK = $(ROOT)/libnetdisk.a
+#DLIB_NETDISK = $(ROOT)/libnetdisk.so
 PLATFORM=$(shell $(ROOT)/systype.sh)
 include $(ROOT)/Make.defines.$(PLATFORM)
 
-all: netdisk_service test_client test test_queue test_properties
+ 
+PROGS = netdisk_service test_client test test_queue test_properties
+
+
+build: $(PROGS)
 
 
 netdisk_service: $(ROOT)/device/hcnetdisk.c $(ROOT)/device/netdisk_factory.c login_store.c request_handler.c properties_config.c
+
+test_client: test_client.c properties_config.c
 
 test: $(ROOT)/device/hcnetdisk.c
 
 test_properties: properties_config.c
 
 clean:
-	rm -f test *.o a.out core temp.* *.a *.so
+	rm -f $(TEMPFILES) $(PROGS)
 
 
 include $(ROOT)/Make.common.inc

--
Gitblit v1.8.0