From f81ce85730319b8267996ab5399848ad2f520857 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Wed, 17 Aug 2022 09:07:01 +0200 Subject: [PATCH 1/2] Android.mk: fix compilation of can-calc-bit-timing Fixes: 9c38c16437e9 ("can-calc-bit-timing: move into subdir") Reported-by: Tompee Balauag Link: https://github.com/linux-can/can-utils/issues/373 Signed-off-by: Marc Kleine-Budde --- Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Android.mk b/Android.mk index 85fbb8a..9aef576 100644 --- a/Android.mk +++ b/Android.mk @@ -181,7 +181,7 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) -LOCAL_SRC_FILES := can-calc-bit-timing.c +LOCAL_SRC_FILES := calc-bit-timing/can-calc-bit-timing.c LOCAL_MODULE := can-calc-bit-timing LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ From e0945d867eeab54b2275e27f95f53a71b33dac31 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Wed, 17 Aug 2022 09:07:01 +0200 Subject: [PATCH 2/2] CMakeLists: fix compilation of can-calc-bit-timing Fixes: 9c38c16437e9 ("can-calc-bit-timing: move into subdir") Reported-by: Tompee Balauag Link: https://github.com/linux-can/can-utils/issues/373 Signed-off-by: Marc Kleine-Budde --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c317188..7088c51 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,7 +46,6 @@ set(PROGRAMS_J1939 set(PROGRAMS ${PROGRAMS_CANLIB} bcmserver - can-calc-bit-timing canfdtest cangw cansniffer