From 9b29a67af93e4ab9948cc60f743d73c4bb39e738 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 20 十月 2020 16:46:55 +0800
Subject: [PATCH] update
---
src/Makefile | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 33baad0..4dc86a4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -7,14 +7,16 @@
PREFIX = $(DEST)
-LIBSQUEUE = libshm_queue.a
-DLIBSQUEUE = libshm_queue.so
+LIBSQUEUE = $(DEST)/lib/libshm_queue.a
+DLIBSQUEUE = $(DEST)/lib/libshm_queue.so
# 寮�婧愬伐鍏峰寘
-LDLIBS += -lusgcommon
+#LDLIBS += -lusgcommon
-INCLUDES += -I./queue -I./socket -I$(ROOT)/include/usgcommon
+#-I$(ROOT)/include/usgcommon
+
+INCLUDES += -I./queue -I./socket -I./common/include
SOURCES := $(wildcard *.c ./**/*.c)
OBJS = $(patsubst %.c, $(DEST)/%.o, $(SOURCES))
@@ -33,15 +35,21 @@
PREFIX := /usr/local
endif
-all: install
+all: build
.PHONY: build
build: prebuild $(MYLIBS)
+ cp $(ROOT)/.gdbinit $(DEST)
+ # mkdir -p $(DEST)/lib
+ # cp $(MYLIBS) $(DEST)/lib
+ # mkdir -p $(DEST)/include/shmqueue
+ # cp ./*.h ./queue/*.h ./socket/*.h $(DEST)/include/shmqueue
+ # cp $(ROOT)/lib/* $(DEST)/lib
.PHONY: prebuild
prebuild:
- @test -d $(DEST) || mkdir $(DEST)
+ @test -d $(DEST)/lib || mkdir -p $(DEST)/lib
#static lib
$(LIBSQUEUE): $(OBJS)
--
Gitblit v1.8.0