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

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
git-svn-id: svn://svn.berlios.de//socketcan/trunk@1184 030b6a49-0b11-0410-94ab-b0dab22257f2

diff --git a/can-utils/.gitignore b/can-utils/.gitignore
index ccb1fb487fb7c72c618f3d3049d7d4ef087065d2..0d0144d17b8e993474ebaacf9346ea3298d4332d 100644 (file)
--- a/can-utils/.gitignore
+++ b/can-utils/.gitignore
@@ -23,6 +23,7 @@ GNUmakefile.in
 
 /asc2log
 /bcmserver
+/can-calc-bit-timing
 /canbusload
 /candump
 /canfdtest

diff --git a/can-utils/GNUmakefile.am b/can-utils/GNUmakefile.am
index 1bd6e722dae1e9a286575bb6f809c335a932688f..d507a766ee475cbee7ed3b011315d84500955ea8 100644 (file)
--- a/can-utils/GNUmakefile.am
+++ b/can-utils/GNUmakefile.am
@@ -22,6 +22,7 @@ libcan_la_SOURCES = \
 bin_PROGRAMS = \
        asc2log \
        bcmserver \
+       can-calc-bit-timing \
        canbusload \
        candump \
        canfdtest \

diff --git a/can-utils/Makefile b/can-utils/Makefile
index 8e6c60910a1639e3df45062886d39b7c277afeba..2c75e42c518a5c6afa01b023d5ab2798fe1a516b 100644 (file)
--- a/can-utils/Makefile
+++ b/can-utils/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)\