Some binaries in can-utils depend on features in the socket-can svn

repository. Building with exported headers from an unpatched kernel will
fail due to missing symbols or headers.

This patch adds two make variables to optionally disable building such
binaries, like this:

make PROGRAMS_ISOTP= PROGRAMS_CANGW= PROGRAMS_SLCAN= all

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Oliver Hartkopp <oliver@hartkopp.net>

diff --git a/Makefile b/Makefile
index 550e94ba2596181ba4000a39be5cab034f07970f..cd5af9c5e276e522b643439bed57a75a1f8852b9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -53,10 +53,16 @@ CFLAGS    = -O2 -Wall -Wno-parentheses -I$(KERNELDIR)/include \
            -DPF_CAN=29 \
            -DAF_CAN=PF_CAN
 
-PROGRAMS = candump cansniffer cansend canplayer canlogserver cangen\
-          canbusload log2long log2asc asc2log bcmserver\
-          isotpdump isotprecv isotpsend isotpsniffer isotptun\
-          slcan_attach slcand slcanpty canfdtest cangw
+PROGRAMS_ISOTP = isotpdump isotprecv isotpsend isotpsniffer isotptun
+PROGRAMS_CANGW = cangw
+PROGRAMS_SLCAN = slcan_attach slcand
+PROGRAMS = candump cansniffer cansend canplayer cangen canbusload\
+          log2long log2asc asc2log\
+          canlogserver bcmserver\
+          $(PROGRAMS_ISOTP)\
+          $(PROGRAMS_CANGW)\
+          $(PROGRAMS_SLCAN)\
+          slcanpty canfdtest
 
 all: $(PROGRAMS)