From baa6fb17d950c4f5684f5d798f90595456723418 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 28 七月 2020 16:16:46 +0800
Subject: [PATCH] conflict

---
 Makefile |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index adac55f..b4fa973 100755
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
-DIRS = src test test2 demo
+DIRS = src test_socket demo test
+TAR_NAME = shm_queue.tar.gz
 
 all:
 	for i in $(DIRS); do \
@@ -9,12 +10,9 @@
 	for i in $(DIRS); do \
 		(cd $$i && echo "cleaning $$i" && $(MAKE) clean) || exit 1; \
 	done
+	rm -rf build
+	ipcrm -a
 
-ipcrm:
-	-ipcrm -a
-	-ipcs
-
-# 	-ipcrm -M 0x1234
-# 	-ipcrm -S 145
-# 	-ipcrm -S 146
-# 	-ipcrm -S 8899
+tar:
+	rm -f $(TAR_NAME)
+	git archive --format tar.gz --output $(TAR_NAME) master
\ No newline at end of file

--
Gitblit v1.8.0