From 4a09e6370a9d730af001a3c5f2736e69e8c170c2 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Mon, 5 Jan 2015 18:43:26 -0500 Subject: move sbus2_test to cmake --- unittests/Makefile | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'unittests/Makefile') diff --git a/unittests/Makefile b/unittests/Makefile index e1d2acacc..1d6db6817 100644 --- a/unittests/Makefile +++ b/unittests/Makefile @@ -40,11 +40,7 @@ gtest_main.a: gtest-all.o gtest_main.o $(AR) $(ARFLAGS) $@ $^ -all: sbus2_test st24_test sf0x_test - -SBUS2_FILES=../src/modules/px4iofirmware/sbus.c \ - hrt.cpp \ - sbus2_test.cpp +all: st24_test sf0x_test ST24_FILES=../src/lib/rc/st24.c \ hrt.cpp \ @@ -55,9 +51,6 @@ SF0X_FILES= \ sf0x_test.cpp \ ../src/drivers/sf0x/sf0x_parser.cpp -sbus2_test: $(SBUS2_FILES) - $(CC) -o sbus2_test $(SBUS2_FILES) $(CFLAGS) - sf0x_test: $(SF0X_FILES) $(CC) -o sf0x_test $(SF0X_FILES) $(CFLAGS) @@ -68,11 +61,10 @@ cmake_gtests: mkdir -p build cd build && CC=gcc cmake .. && $(MAKE) check -unittests: clean sbus2_test sf0x_test st24_test cmake_gtests - ./sbus2_test +unittests: clean sf0x_test st24_test cmake_gtests ./sf0x_test ./st24_test .PHONY: clean clean: - rm -rf gtest.a gtest_main.a *.o $(ODIR)/*.o *~ core $(INCDIR)/*~ sample_unittest sbus2_test st24_test sf0x_test build + rm -rf gtest.a gtest_main.a *.o $(ODIR)/*.o *~ core $(INCDIR)/*~ sample_unittest st24_test sf0x_test build -- cgit v1.2.3