summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Peplin <chris.peplin@rhubarbtech.com>2013-12-27 14:14:14 -0500
committerChristopher Peplin <chris.peplin@rhubarbtech.com>2013-12-27 14:14:14 -0500
commit61344915dfdd01101d086b79b56109a9942cbf1a (patch)
treea56b3824df2b4754bfaed66b5e579cac48ee83e5
parente6d46d95d3165ae944c1b235b94002a09a83fde9 (diff)
Add canutil dependency for bit field manipulation.
-rw-r--r--.gitignore4
-rw-r--r--.gitmodules3
-rw-r--r--Makefile3
m---------deps/canutil6
4 files changed, 15 insertions, 1 deletions
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
+Subproject 04a4db7d336ae2cae94ac3234086b22fbf1339f