From 61344915dfdd01101d086b79b56109a9942cbf1a Mon Sep 17 00:00:00 2001 From: Christopher Peplin Date: Fri, 27 Dec 2013 14:14:14 -0500 Subject: [PATCH] Add canutil dependency for bit field manipulation. --- .gitignore | 4 ++++ .gitmodules | 3 +++ Makefile | 3 ++- deps/canutil | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 .gitmodules create mode 160000 deps/canutil diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..b4225c09 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*.o +.DS_Store +*~ +*.bin diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..6114ce5e --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "deps/canutil"] + path = deps/canutil + url = https://github.com/openxc/canutil diff --git a/Makefile b/Makefile index 49e22f2c..0dd93599 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CC = gcc -INCLUDES = -Isrc +INCLUDES = -Isrc -Ideps/canutil/src CFLAGS = $(INCLUDES) -c -w -Wall -Werror -g -ggdb LDFLAGS = LDLIBS = -lcheck @@ -16,6 +16,7 @@ ifneq ($(OSTYPE),Darwin) endif SRC = $(wildcard src/**/*.c) +SRC = $(wildcard deps/**/*.c) OBJS = $(SRC:.c=.o) TEST_SRC = $(wildcard $(TEST_DIR)/*.c) TEST_OBJS = $(TEST_SRC:.c=.o) diff --git a/deps/canutil b/deps/canutil new file mode 160000 index 00000000..04a4db7d --- /dev/null +++ b/deps/canutil @@ -0,0 +1 @@ +Subproject commit 04a4db7d336ae2cae94ac3234086b22fbf1339f0 -- 2.16.6