From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Tue, 20 Jul 2010 13:43:01 +0000 (+0000)
Subject: add can-calc-bit-timing to Makefiles + gitignore
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/sojka/can-utils.git/commitdiff_plain/b2d3f4f7357847a8a9a89bbde3dd4281afccb14d

add can-calc-bit-timing to Makefiles + gitignore

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---

diff --git a/.gitignore b/.gitignore
index ccb1fb4..0d0144d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ GNUmakefile.in
 
 /asc2log
 /bcmserver
+/can-calc-bit-timing
 /canbusload
 /candump
 /canfdtest
diff --git a/GNUmakefile.am b/GNUmakefile.am
index 1bd6e72..d507a76 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -22,6 +22,7 @@ libcan_la_SOURCES = \
 bin_PROGRAMS = \
 	asc2log \
 	bcmserver \
+	can-calc-bit-timing \
 	canbusload \
 	candump \
 	canfdtest \
diff --git a/Makefile b/Makefile
index 8e6c609..2c75e42 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,7 @@ CFLAGS    = -O2 -Wall -Wno-parentheses -I$(KERNELDIR)/include \
 PROGRAMS_ISOTP = isotpdump isotprecv isotpsend isotpsniffer isotptun isotpserver
 PROGRAMS_CANGW = cangw
 PROGRAMS_SLCAN = slcan_attach slcand
-PROGRAMS = candump cansniffer cansend canplayer cangen canbusload\
+PROGRAMS = can-calc-bit-timing candump cansniffer cansend canplayer cangen canbusload\
 	   log2long log2asc asc2log\
 	   canlogserver bcmserver\
 	   $(PROGRAMS_ISOTP)\