Merge pull request #21 from paullouisageneau/deps

Separate directory for dependencies

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "usrsctp"]
-	path = usrsctp
+	path = deps/usrsctp
 	url = https://github.com/sctplab/usrsctp.git

CMakeLists.txt

@@ -26,12 +26,12 @@ set(TESTS_SOURCES
 )
 
 # Hack because usrsctp uses CMAKE_SOURCE_DIR instead of CMAKE_CURRENT_SOURCE_DIR
-set(CMAKE_REQUIRED_FLAGS "-I${CMAKE_CURRENT_SOURCE_DIR}/usrsctp/usrsctplib")
+set(CMAKE_REQUIRED_FLAGS "-I${CMAKE_CURRENT_SOURCE_DIR}/deps/usrsctp/usrsctplib")
 
-add_subdirectory(usrsctp EXCLUDE_FROM_ALL)
+add_subdirectory(deps/usrsctp EXCLUDE_FROM_ALL)
 
 # Set include directory and custom options to make usrsctp compile with recent g++
-target_include_directories(usrsctp-static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/usrsctp/usrsctplib)
+target_include_directories(usrsctp-static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/deps/usrsctp/usrsctplib)
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   # using regular Clang or AppleClang: Needed since they don't have -Wno-error=format-truncation
@@ -43,7 +43,7 @@ else()
 	  target_compile_options(usrsctp-static PRIVATE -Wno-error=format-truncation)
 	else()
 	  target_compile_options(usrsctp-static PRIVATE -Wno-error=address-of-packed-member -Wno-error=format-truncation)
-	endif()  
+	endif()
   else()
     # all other compilers
     target_compile_options(usrsctp-static PRIVATE -Wno-error=address-of-packed-member -Wno-error=format-truncation)

Jamfile

@@ -22,17 +22,17 @@ alias usrsctp
     : # no build requirements
     : # no default build
     : # usage requirements
-    <include>./usrsctp/usrsctplib
+    <include>./deps/usrsctp/usrsctplib
 	<library>libusrsctp.a
     ;
 
 make libusrsctp.a : : @make_libusrsctp ;
 actions make_libusrsctp
 {
-	(cd $(CWD)/usrsctp && \
+	(cd $(CWD)/deps/usrsctp && \
 		./bootstrap && \
 		./configure --enable-static --disable-debug CFLAGS="-fPIC -Wno-address-of-packed-member" && \
 		make)
-    cp $(CWD)/usrsctp/usrsctplib/.libs/libusrsctp.a $(<)
+    cp $(CWD)/deps/usrsctp/usrsctplib/.libs/libusrsctp.a $(<)
 }
 

Makefile

@@ -8,7 +8,7 @@ CPPFLAGS=-O2 -pthread -fPIC -Wall -Wno-address-of-packed-member
 CXXFLAGS=-std=c++17
 LDFLAGS=-pthread
 LIBS=glib-2.0 gobject-2.0 nice
-USRSCTP_DIR=usrsctp
+USRSCTP_DIR=deps/usrsctp
 
 USE_GNUTLS ?= 0
 ifneq ($(USE_GNUTLS), 0)