From ed1f486e2c2d8c02d675363d848a3460edfe80e3 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 29 十二月 2020 16:22:34 +0800
Subject: [PATCH] update

---
 src/shm/hashtable.c      |    0 
 src/shm/mm.c             |    0 
 src/shm/shm_mm_wrapper.c |    0 
 src/shm/hashtable.h      |    0 
 src/shm/mm.h             |    0 
 src/shm/shm_allocator.h  |    0 
 src/Makefile             |    4 ++--
 src/shm/mem_pool.h       |    0 
 test_net_socket/Makefile |    2 +-
 src/shm/shm_mm_wraper.h  |    0 
 10 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 6cc7810..89b9f59 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -16,7 +16,7 @@
 
 #-I$(ROOT)/include/usgcommon
 
-INCLUDES += -I./queue -I./socket  -I$(ROOT)/include/usgcommon
+INCLUDES += -I./shm -I./queue -I./socket  -I$(ROOT)/include/usgcommon
 
 SOURCES := $(wildcard *.c ./**/*.c)
 OBJS   = $(patsubst %.c, $(DEST)/%.o, $(SOURCES)) 
@@ -71,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  $(PREFIX)/include/shmqueue
+	install -m 644 ./*.h ./shm/*.h ./queue/*.h ./socket/*.h  $(PREFIX)/include/shmqueue
 
 
 .PHONY: uninstall
diff --git a/src/queue/hashtable.c b/src/shm/hashtable.c
similarity index 100%
rename from src/queue/hashtable.c
rename to src/shm/hashtable.c
diff --git a/src/queue/hashtable.h b/src/shm/hashtable.h
similarity index 100%
rename from src/queue/hashtable.h
rename to src/shm/hashtable.h
diff --git a/src/queue/mem_pool.h b/src/shm/mem_pool.h
similarity index 100%
rename from src/queue/mem_pool.h
rename to src/shm/mem_pool.h
diff --git a/src/queue/mm.c b/src/shm/mm.c
similarity index 100%
rename from src/queue/mm.c
rename to src/shm/mm.c
diff --git a/src/queue/mm.h b/src/shm/mm.h
similarity index 100%
rename from src/queue/mm.h
rename to src/shm/mm.h
diff --git a/src/queue/shm_allocator.h b/src/shm/shm_allocator.h
similarity index 100%
rename from src/queue/shm_allocator.h
rename to src/shm/shm_allocator.h
diff --git a/src/queue/shm_mm_wraper.h b/src/shm/shm_mm_wraper.h
similarity index 100%
rename from src/queue/shm_mm_wraper.h
rename to src/shm/shm_mm_wraper.h
diff --git a/src/queue/shm_mm_wrapper.c b/src/shm/shm_mm_wrapper.c
similarity index 100%
rename from src/queue/shm_mm_wrapper.c
rename to src/shm/shm_mm_wrapper.c
diff --git a/test_net_socket/Makefile b/test_net_socket/Makefile
index 832a130..adbcef3 100644
--- a/test_net_socket/Makefile
+++ b/test_net_socket/Makefile
@@ -12,7 +12,7 @@
 LDLIBS += -lshm_queue -lpthread -lusgcommon
 
 #-I$(ROOT)/include/usgcommon
-INCLUDES += -I${ROOT}/src -I${ROOT}/src/queue -I${ROOT}/src/socket -I${ROOT}/src/common/include -I${ROOT}/include/usgcommon
+INCLUDES += -I${ROOT}/src -I${ROOT}/src/shm -I${ROOT}/src/queue -I${ROOT}/src/socket  -I${ROOT}/include/usgcommon
 
 PROGS = ${DEST}/test_net_mod_socket ${DEST}/test_bus_stop ${DEST}/heart_beat
 

--
Gitblit v1.8.0