canbusload: Add exact CAN frame length calculation (including bitstuffing)

[can-utils.git] / Makefile

diff --git a/Makefile b/Makefile
index 727f760b30518dc75f8eb7b283cb9c2564659def..ab99746ade877507701632e9af1632c2e8fc6c5a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,4 @@
 #
-#  $Id$
-#
 #  Copyright (c) 2002-2005 Volkswagen Group Electronic Research
 #  All rights reserved.
 #
@@ -38,17 +36,29 @@
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 #  DAMAGE.
 #
-#  Send feedback to <socketcan-users@lists.berlios.de>
+#  Send feedback to <linux-can@vger.kernel.org>
+
+DESTDIR ?=
+PREFIX ?= /usr/local
 
 MAKEFLAGS = -k
 
-CFLAGS    = -O2 -Wall -Wno-parentheses -I../kernel/2.6/include \
+CFLAGS    = -O2 -Wall -Wno-parentheses -Iinclude \
            -fno-strict-aliasing \
+           -DSO_RXQ_OVFL=40 \
            -DPF_CAN=29 \
            -DAF_CAN=PF_CAN
 
-PROGRAMS = candump cansniffer cansend canplayer canlogserver cangen\
-          canbusload log2long log2asc asc2log vcan slcan_attach
+PROGRAMS_ISOTP = isotpdump isotprecv isotpsend isotpsniffer isotptun isotpserver
+PROGRAMS_CANGW = cangw
+PROGRAMS_SLCAN = slcan_attach slcand
+PROGRAMS = can-calc-bit-timing candump cansniffer cansend canplayer cangen canbusload\
+          log2long log2asc asc2log\
+          canlogserver bcmserver\
+          $(PROGRAMS_ISOTP)\
+          $(PROGRAMS_CANGW)\
+          $(PROGRAMS_SLCAN)\
+          slcanpty canfdtest
 
 all: $(PROGRAMS)
 
@@ -56,7 +66,8 @@ clean:
        rm -f $(PROGRAMS) *.o
 
 install:
-       cp -f $(PROGRAMS) /usr/local/bin
+       mkdir -p $(DESTDIR)$(PREFIX)/bin
+       cp -f $(PROGRAMS) $(DESTDIR)$(PREFIX)/bin
 
 distclean:
        rm -f $(PROGRAMS) *.o *~
@@ -70,6 +81,7 @@ canbusload.o: lib.h
 log2long.o:    lib.h
 log2asc.o:     lib.h
 asc2log.o:     lib.h
+canframelen.o:  canframelen.h
 
 cansend:       cansend.o       lib.o
 cangen:                cangen.o        lib.o
@@ -79,3 +91,4 @@ canlogserver: canlogserver.o  lib.o
 log2long:      log2long.o      lib.o
 log2asc:       log2asc.o       lib.o
 asc2log:       asc2log.o       lib.o
+canbusload:    canbusload.o    canframelen.o