machinarium: move source code base from lib into src

2017-01-17 17:12:21 +03:00 · 2017-01-17 17:12:21 +03:00 · 0c466a90ae
parent f9a5fa50d3
commit 0c466a90ae
28 changed files with 6 additions and 6 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -15,8 +15,8 @@ elseif("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
    set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -O0")
 endif()

-include_directories("${PROJECT_SOURCE_DIR}/lib")
-include_directories("${PROJECT_BINARY_DIR}/lib")
+include_directories("${PROJECT_SOURCE_DIR}/src")
+include_directories("${PROJECT_BINARY_DIR}/src")

 set(mm_libraries "")

@ -26,7 +26,7 @@ include_directories(${LIBUV_INCLUDE_DIRS})

 option(BUILD_STATIC "Enable Static" OFF)

-add_subdirectory(lib)
+add_subdirectory(src)

 message (STATUS "")
 message (STATUS "machinarium: cooperative multitasking library.")
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
--- a/src/machinarium.h
+++ b/src/machinarium.h
--- a/src/machinarium_private.h
+++ b/src/machinarium_private.h
--- a/src/mm.c
+++ b/src/mm.c
--- a/src/mm.h
+++ b/src/mm.h
--- a/src/mm_accept.c
+++ b/src/mm_accept.c
--- a/src/mm_bind.c
+++ b/src/mm_bind.c
--- a/src/mm_buf.h
+++ b/src/mm_buf.h
--- a/src/mm_connect.c
+++ b/src/mm_connect.c
--- a/src/mm_context.c
+++ b/src/mm_context.c
--- a/src/mm_context.h
+++ b/src/mm_context.h
--- a/src/mm_fiber.c
+++ b/src/mm_fiber.c
--- a/src/mm_fiber.h
+++ b/src/mm_fiber.h
--- a/src/mm_getaddrinfo.c
+++ b/src/mm_getaddrinfo.c
--- a/src/mm_getpeername.c
+++ b/src/mm_getpeername.c
--- a/src/mm_getsockname.c
+++ b/src/mm_getsockname.c
--- a/src/mm_io.c
+++ b/src/mm_io.c
--- a/src/mm_io.h
+++ b/src/mm_io.h
--- a/src/mm_list.h
+++ b/src/mm_list.h
--- a/src/mm_macro.h
+++ b/src/mm_macro.h
--- a/src/mm_read.c
+++ b/src/mm_read.c
--- a/src/mm_read.h
+++ b/src/mm_read.h
--- a/src/mm_read_sync.c
+++ b/src/mm_read_sync.c
--- a/src/mm_scheduler.c
+++ b/src/mm_scheduler.c
--- a/src/mm_scheduler.h
+++ b/src/mm_scheduler.h
--- a/src/mm_write.c
+++ b/src/mm_write.c
--- a/tests/makefile
+++ b/tests/makefile
@ -1,7 +1,7 @@
 CC         = gcc
 RM         = rm
-CFLAGS     = -I. -Wall -g -O0 -I../lib
-LFLAGS_LIB = ../lib/libmachinarium.a
+CFLAGS     = -I. -Wall -g -O0 -I../src
+LFLAGS_LIB = ../src/libmachinarium.a
 LFLAGS_LIB_UV = -luv -pthread #~/temp/libuv/.libs/libuv.a -pthread
 LFLAGS     = $(LFLAGS_LIB) $(LFLAGS_LIB_UV)
 TESTS      = test_new \
@ -63,7 +63,7 @@ echo:
 benchmark:
 	$(CC) $(CFLAGS) benchmark.c $(LFLAGS) -o benchmark
 validate:
-	@if [ ! -f ../lib/libmachinarium.a ]; then \
+	@if [ ! -f ../src/libmachinarium.a ]; then \
 		echo ""; \
 		echo "Please build the static library first."; \
 		echo ""; \