From 9c38c16437e9c0ae4c4e0c8977a8253b1e8db9f8 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Fri, 18 Mar 2022 13:28:18 +0100 Subject: [PATCH] can-calc-bit-timing: move into subdir The source file will be split into several files in the next patches. Signed-off-by: Marc Kleine-Budde --- .gitignore | 1 + CMakeLists.txt | 4 ++++ GNUmakefile.am | 3 +++ Makefile | 5 ++++- .../can-calc-bit-timing.c | 0 5 files changed, 12 insertions(+), 1 deletion(-) rename can-calc-bit-timing.c => calc-bit-timing/can-calc-bit-timing.c (100%) diff --git a/.gitignore b/.gitignore index 568f070..1faf977 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ GNUmakefile.in /config/m4/ltsugar.m4 /config/m4/ltversion.m4 /config/m4/lt~obsolete.m4 +/calc-bit-timing/.dirstamp /mcp251xfd/.dirstamp /asc2log diff --git a/CMakeLists.txt b/CMakeLists.txt index fea4171..c317188 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,6 +62,10 @@ set(PROGRAMS slcanpty ) +add_executable(can-calc-bit-timing + calc-bit-timing/can-calc-bit-timing.c +) + add_executable(mcp251xfd-dump mcp251xfd/mcp251xfd-dev-coredump.c mcp251xfd/mcp251xfd-dump.c diff --git a/GNUmakefile.am b/GNUmakefile.am index 02c37ab..ed55131 100644 --- a/GNUmakefile.am +++ b/GNUmakefile.am @@ -39,6 +39,9 @@ libcan_la_SOURCES = \ libj1939_la_SOURCES = \ libj1939.c +can_calc_bit_timing_SOURCES = \ + calc-bit-timing/can-calc-bit-timing.c + mcp251xfd_dump_SOURCES = \ mcp251xfd/mcp251xfd-dev-coredump.c \ mcp251xfd/mcp251xfd-dump-userspace.h \ diff --git a/Makefile b/Makefile index fb52643..970a4cb 100644 --- a/Makefile +++ b/Makefile @@ -142,5 +142,8 @@ j1939sr: j1939sr.o libj1939.o testj1939: testj1939.o libj1939.o canbusload: canbusload.o canframelen.o -mcp251xfd-dump: mcp251xfd/mcp251xfd-dev-coredump.o mcp251xfd/mcp251xfd-dump.o mcp251xfd/mcp251xfd-main.o mcp251xfd/mcp251xfd-regmap.o +can-calc-bit-timing: calc-bit-timing/can-calc-bit-timing.o + $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@ + +mcp251xfd-dump: mcp251xfd/mcp251xfd-dev-coredump.o mcp251xfd/mcp251xfd-dump.o mcp251xfd/mcp251xfd-main.o mcp251xfd/mcp251xfd-regmap.o $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@ diff --git a/can-calc-bit-timing.c b/calc-bit-timing/can-calc-bit-timing.c similarity index 100% rename from can-calc-bit-timing.c rename to calc-bit-timing/can-calc-bit-timing.c