From: Oliver Hartkopp Date: Wed, 17 Mar 2010 19:21:38 +0000 (+0000) Subject: Some binaries in can-utils depend on features in the socket-can svn X-Git-Url: http://rtime.felk.cvut.cz/gitweb/sojka/can-utils.git/commitdiff_plain/ee562a97242625bf6853030d600618cbb3731f06?hp=f731bbe2a2ac90a108747bf79fcc6c3f2bbc32b9 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 Signed-off-by: Oliver Hartkopp --- diff --git a/Makefile b/Makefile index 550e94b..cd5af9c 100644 --- 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)