candump: Avoid ragged output of timestamp values when printing differential

[sojka/can-utils.git] / Makefile

diff --git a/Makefile b/Makefile
index bceec585188dd32b96ce618b14746d660d0105af..2c75e42c518a5c6afa01b023d5ab2798fe1a516b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -38,28 +38,59 @@
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 #  DAMAGE.
 #
-#  Send feedback to <llcf@volkswagen.de>
+#  Send feedback to <socketcan-users@lists.berlios.de>
 
-CFLAGS    = -O2 -Wall -Wno-parentheses -I../kernel/2.4/can -fno-strict-aliasing
+DESTDIR =
+PREFIX = /usr/local
 
-PROGRAMS_GPL =         candump         \
-               can-sniffer
+KERNELDIR = ../kernel/2.6
 
-PROGRAMS_VW =  tpdump          \
-               tp20-sniffer    \
-               mcnet-vit-emu   \
-               mcnet-sniffer   \
-               pq35speed
+MAKEFLAGS = -k
 
-default: all-gpl
+CFLAGS    = -O2 -Wall -Wno-parentheses -I$(KERNELDIR)/include \
+           -fno-strict-aliasing \
+           -DSO_RXQ_OVFL=40 \
+           -DPF_CAN=29 \
+           -DAF_CAN=PF_CAN
 
-all: all-gpl all-vw
+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-gpl: $(PROGRAMS_GPL)
-all-vw:  $(PROGRAMS_VW)
+all: $(PROGRAMS)
 
 clean:
-       rm -f $(PROGRAMS_GPL) $(PROGRAMS_VW)
+       rm -f $(PROGRAMS) *.o
+
+install:
+       mkdir -p $(DESTDIR)$(PREFIX)/bin
+       cp -f $(PROGRAMS) $(DESTDIR)$(PREFIX)/bin
 
 distclean:
-       rm -f $(PROGRAMS_GPL) $(PROGRAMS_VW) *~
+       rm -f $(PROGRAMS) *.o *~
+
+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
+canlogserver:  canlogserver.o  lib.o
+log2long:      log2long.o      lib.o
+log2asc:       log2asc.o       lib.o
+asc2log:       asc2log.o       lib.o