Merge branch 'master' of gitlab.control.lth.se:anders_blomdell/extctrl2014

mc/Makefile

@@ -16,7 +16,6 @@ GLOBALIZE=netFuncs \
 	  hpnet_traffic_activated \
 	  hpnetObjects
 
-EXTRA_CFLAGS_hijacknet_lth_net=-I/opt/robot/include
 EXTRA_CFLAGS_fei82557End=-Wno-error -Wno-all -Wno-endif-labels
 EXTRA_CFLAGS_extctrl2014_lc=-I/usr/include/labcomm \
                             -DLABCOMM_COMPAT="<labcomm_compat.h>"
@@ -29,7 +28,7 @@ ROBOTWARE=$(shell [ -n "$(ROBOT)" ] && \
 	    ../tools/abb_extctrl_setup.py --robot "$(ROBOT)" --robotware)
 DESTDIR=$(USER)
 
-VPATH = /opt/robot ../common
+VPATH = ../common
 
 .PRECIOUS: %.c %.h
 

mc/hijacknet_lth_net.mc.c

@@ -4,7 +4,6 @@
 #include <string.h>
 #include <fppLib.h>
 #include <hijacknet.h>
-#include <lth/lth_net/lth_net.h>
 
 #define LTH_NET_ID (('L' << 8) + ('N'))
 #define ETHERNET_INTERFACE_COUNT 10