Use renamed bitfield-c dependency.

[apps/agl-service-can-low-level.git] / Makefile

diff --git a/Makefile b/Makefile
index 49e22f2..a8ea84c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 CC = gcc
-INCLUDES = -Isrc
-CFLAGS = $(INCLUDES) -c -w -Wall -Werror -g -ggdb
+INCLUDES = -Isrc -Ideps/canutil/src
+CFLAGS = $(INCLUDES) -c -w -Wall -Werror -g -ggdb -std=c99
 LDFLAGS =
 LDLIBS = -lcheck
 
@@ -16,10 +16,12 @@ ifneq ($(OSTYPE),Darwin)
 endif
 
 SRC = $(wildcard src/**/*.c)
+SRC += $(wildcard deps/canutil/src/**/*.c)
 OBJS = $(SRC:.c=.o)
-TEST_SRC = $(wildcard $(TEST_DIR)/*.c)
-TEST_OBJS = $(TEST_SRC:.c=.o)
+TEST_SRC = $(wildcard $(TEST_DIR)/test_*.c)
 TESTS=$(patsubst %.c,%.bin,$(TEST_SRC))
+TEST_SUPPORT_SRC = $(TEST_DIR)/common.c
+TEST_SUPPORT_OBJS = $(TEST_SUPPORT_SRC:.c=.o)
 
 all: $(OBJS)
 
@@ -28,7 +30,7 @@ test: $(TESTS)
        @export SHELLOPTS
        @sh runtests.sh $(TEST_DIR)
 
-$(TEST_DIR)/%.bin: $(TEST_DIR)/%.o $(OBJS)
+$(TEST_DIR)/%.bin: $(TEST_DIR)/%.o $(OBJS) $(TEST_SUPPORT_OBJS)
        @mkdir -p $(dir $@)
        $(CC) $(LDFLAGS) $(CC_SYMBOLS) $(INCLUDES) -o $@ $^ $(LDLIBS)