From be9fe29197f7c8201ef5dec8e7667b59ba8d3851 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 11 一月 2021 19:35:34 +0800
Subject: [PATCH] update

---
 src/Makefile |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 4dc86a4..b126aa1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -12,15 +12,15 @@
 
 
 # 寮�婧愬伐鍏峰寘
-#LDLIBS += -lusgcommon
+LDLIBS += -lusgcommon
 
 #-I$(ROOT)/include/usgcommon
 
-INCLUDES += -I./queue -I./socket -I./common/include 
+INCLUDES += -I./shm -I./queue -I./socket  -I$(ROOT)/include/usgcommon
 
-SOURCES := $(wildcard *.c ./**/*.c)
-OBJS   = $(patsubst %.c, $(DEST)/%.o, $(SOURCES)) 
-DEPENDENCES = $(patsubst %.c, $(DEST)/%.d, $(SOURCES)) 
+SOURCES := $(wildcard *.cpp ./**/*.cpp)
+OBJS   = $(patsubst %.cpp, $(DEST)/%.o, $(SOURCES)) 
+DEPENDENCES = $(patsubst %.cpp, $(DEST)/%.d, $(SOURCES)) 
 
 # MYLIBS = $(LIBCOMMON) $(DLIBCOMMON)
 
@@ -60,18 +60,18 @@
 #dynamic lib
 $(DLIBSQUEUE): $(SOURCES)
 	@echo '>>>>>>' generating $@ ...
-	$(CC) -fPIC -shared $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ -o $@
+	$(CC) -fPIC -shared  $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)  $^ -o $@ $(LDLIBS)
 
 
 
-# 浣跨敤鏂瑰紡锛� g++ test1.c  -lcommon
+# 浣跨敤鏂瑰紡锛� g++ test1.cpp  -lcommon
 .PHONY: install
 install: $(MYLIBS)
 	@echo '>>>>>>' installing $^ ...
 	install -d $(PREFIX)/lib/
 	install -m 644 $^ $(PREFIX)/lib/
 	install -d $(PREFIX)/include/shmqueue
-	install -m 644 ./*.h ./queue/*.h ./socket/*.h  $(PREFIX)/include/shmqueue
+	install -m 644 ./*.h ./shm/*.h ./queue/*.h ./socket/*.h  $(PREFIX)/include/shmqueue
 
 
 .PHONY: uninstall
@@ -84,6 +84,7 @@
 .PHONY: clean
 clean:
 	rm -f $(OBJS) $(MYLIBS) $(DEPENDENCES) $(TEMPFILES)
+	rm -rf $(DEST)/*
 
 
 -include $(DEPENDENCES)

--
Gitblit v1.8.0