From fb8aef5a4908a50d415cf5ed33a10699fdfa9c98 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 22 十二月 2020 11:06:15 +0800
Subject: [PATCH] udpate
---
src/Makefile | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 9039e9c..6cc7810 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
-INCLUDES += -I./queue -I./socket -I./util -I$(ROOT)/include/usgcommon
+#-I$(ROOT)/include/usgcommon
+
+INCLUDES += -I./queue -I./socket -I$(ROOT)/include/usgcommon
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)
@@ -52,7 +60,7 @@
#dynamic lib
$(DLIBSQUEUE): $(SOURCES)
@echo '>>>>>>' generating $@ ...
- $(CC) -fPIC -shared $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ -o $@
+ $(CC) -fPIC -shared $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LDLIBS)
@@ -63,7 +71,7 @@
install -d $(PREFIX)/lib/
install -m 644 $^ $(PREFIX)/lib/
install -d $(PREFIX)/include/shmqueue
- install -m 644 ./*.h ./queue/*.h ./socket/*.h ./util/*.h $(PREFIX)/include/shmqueue
+ install -m 644 ./*.h ./queue/*.h ./socket/*.h $(PREFIX)/include/shmqueue
.PHONY: uninstall
@@ -76,6 +84,7 @@
.PHONY: clean
clean:
rm -f $(OBJS) $(MYLIBS) $(DEPENDENCES) $(TEMPFILES)
+ rm -rf $(DEST)/*
-include $(DEPENDENCES)
--
Gitblit v1.8.0