candump: add option -e to dump error messages in human readable format

[sojka/can-utils.git] / Makefile

diff --git a/Makefile b/Makefile
index 81d30ae5b478887d1f76c5b57c2a813774adf5d3..2c75e42c518a5c6afa01b023d5ab2798fe1a516b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -40,13 +40,29 @@
 #
 #  Send feedback to <socketcan-users@lists.berlios.de>
 
-CFLAGS    = -O2 -Wall -Wno-parentheses -I../kernel/2.6/include \
+DESTDIR =
+PREFIX = /usr/local
+
+KERNELDIR = ../kernel/2.6
+
+MAKEFLAGS = -k
+
+CFLAGS    = -O2 -Wall -Wno-parentheses -I$(KERNELDIR)/include \
            -fno-strict-aliasing \
+           -DSO_RXQ_OVFL=40 \
            -DPF_CAN=29 \
            -DAF_CAN=PF_CAN
 
-PROGRAMS = candump cansniffer cansend canplayer cangen\
-          log2long log2asc asc2log slcan_attach vcan
+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)
 
@@ -54,23 +70,27 @@ 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 *~
 
-cansend.o:   lib.h
-cangen.o:    lib.h
-candump.o:   lib.h
-canplayer.o: lib.h
-log2long.o:  lib.h
-log2asc.o:   lib.h
-asc2log.o:   lib.h
+cansend.o:     lib.h
+cangen.o:      lib.h
+candump.o:     lib.h
+canplayer.o:   lib.h
+canlogserver.o:        lib.h
+canbusload.o:  lib.h
+log2long.o:    lib.h
+log2asc.o:     lib.h
+asc2log.o:     lib.h
 
-cansend:   cansend.o   lib.o
-cangen:    cangen.o    lib.o
-candump:   candump.o   lib.o
-canplayer: canplayer.o lib.o
-log2long:  log2long.o  lib.o
-log2asc:   log2asc.o   lib.o
-asc2log:   asc2log.o   lib.o
+cansend:       cansend.o       lib.o
+cangen:                cangen.o        lib.o
+candump:       candump.o       lib.o
+canplayer:     canplayer.o     lib.o
+canlogserver:  canlogserver.o  lib.o
+log2long:      log2long.o      lib.o
+log2asc:       log2asc.o       lib.o
+asc2log:       asc2log.o       lib.o