Merge pull request #417 from openxc/single-isotp

Removed isotp-c from base libs directory

.gitmodules

@@ -29,9 +29,6 @@
 [submodule "src/libs/bitfield-c"]
 	path = src/libs/bitfield-c
 	url = https://github.com/openxc/bitfield-c
-[submodule "src/libs/isotp-c"]
-	path = src/libs/isotp-c
-	url = https://github.com/openxc/isotp-c
 [submodule "src/libs/uds-c"]
 	path = src/libs/uds-c
 	url = https://github.com/openxc/uds-c

script/bootstrap/common.sh

@@ -217,7 +217,6 @@ pre-configured Vagrant environment. See the docs for more information."
     sed -i -e 's/\/vagrant\//..\/..\/..\/..\/..\//g' src/libs/AT-commander/lpc17xx/BSP/.git
     sed -i -e 's/\/vagrant\//..\/..\/..\/..\/..\//g' src/libs/AT-commander/lpc17xx/CDL/.git
     sed -i -e 's/\/vagrant\//..\/..\/..\/..\/..\//g' src/libs/AT-commander/lpc17xx/emqueue/.git
-    sed -i -e 's/\/vagrant\//..\/..\/..\/..\/..\//g' src/libs/isotp-c/deps/bitfield-c/.git
     sed -i -e 's/\/vagrant\//..\/..\/..\/..\/..\//g' src/libs/openxc-message-format/libs/nanopb/.git
     sed -i -e 's/\/vagrant\//..\/..\/..\/..\/..\//g' src/libs/uds-c/deps/bitfield-c/.git
     sed -i -e 's/\/vagrant\//..\/..\/..\/..\/..\//g' src/libs/uds-c/deps/isotp-c/.git

src/Makefile

@@ -156,7 +156,7 @@ CROSSPLATFORM_C_SRCS += $(wildcard $(LIBS_PATH)/cJSON/cJSON.c)
 CROSSPLATFORM_C_SRCS += $(wildcard $(LIBS_PATH)/AT-commander/atcommander/atcommander.c)
 CROSSPLATFORM_C_SRCS += $(wildcard $(LIBS_PATH)/emqueue/*.c)
 CROSSPLATFORM_C_SRCS += $(wildcard $(LIBS_PATH)/bitfield-c/src/**/*.c)
-CROSSPLATFORM_C_SRCS += $(wildcard $(LIBS_PATH)/isotp-c/src/**/*.c)
+CROSSPLATFORM_C_SRCS += $(wildcard $(LIBS_PATH)/uds-c/deps/isotp-c/src/**/*.c)
 CROSSPLATFORM_C_SRCS += $(wildcard $(LIBS_PATH)/uds-c/src/**/*.c)
 CROSSPLATFORM_C_SRCS += $(wildcard $(LIBS_PATH)/cmp/cmp.c)
 # TODO put this under a "gen" folder separate from objdir
@@ -177,7 +177,7 @@ INCLUDE_PATHS = -I. -I$(LIBS_PATH)/cJSON -I$(LIBS_PATH)/emqueue \
 				-I$(LIBS_PATH)/nanopb \
 				-I$(LIBS_PATH)/openxc-message-format/gen/cpp \
 				-I$(LIBS_PATH)/bitfield-c/src \
-				-I$(LIBS_PATH)/isotp-c/src \
+				-I$(LIBS_PATH)/uds-c/deps/isotp-c/src \
 				-I$(LIBS_PATH)/uds-c/src \
 				-I$(LIBS_PATH)/cmp \
 

src/platform/pic32/pic32.mk

@@ -2,7 +2,7 @@ BOARD_TAG = mega_pic32
 
 ARDUINO_LIBS = chipKITCAN chipKITUSBDevice chipKITUSBDevice/utility cmp cJSON \
 			   emqueue AT-commander/atcommander \
-			   nanopb bitfield-c/src isotp-c/src uds-c/src
+			   nanopb bitfield-c/src uds-c/deps/isotp-c/src uds-c/src
 ifeq ($(NETWORK), 1)
 ARDUINO_LIBS += chipKITEthernet chipKITEthernet/utility
 endif