userspace: move libwr headers from include/libwr to libwr/include/libwr

Also, fix Makefiles accordingly.

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

userspace/libwr/Makefile

 CC = $(CROSS_COMPILE)gcc
 AR = $(CROSS_COMPILE)ar
-CFLAGS = -Wall -I. -O2  -DDEBUG -ggdb -I../include -I../wrsw_hal -I../mini-rpc
+CFLAGS = -Wall -I. -O2  -DDEBUG -ggdb -I./include -I../include \
+	-I../wrsw_hal -I../mini-rpc
 
 OBJS = trace.o init.o fpga_io.o util.o pps_gen.o i2c.o shw_io.o i2c_bitbang.o \
        i2c_fpga_reg.o pio.o libshw_i2c.o i2c_sfp.o fan.o i2c_io.o hwiu.o \

userspace/tools/Makefile

@@ -29,7 +29,8 @@ CFLAGS =  -O2 -g -Wall \
 		-I../wrsw_rtud \
 		-I../mini-rpc \
 		-I../libsdb \
-		-I../include 
+		-I../include \
+		-I../libwr/include
 
 ifdef WRS_TOOLS_DEBUG
   CFLAGS += -DDEBUG

userspace/wrsw_hal/Makefile

@@ -12,7 +12,7 @@ WR_INCLUDE = $(WR_INSTALL_ROOT)/include
 WR_LIB = $(WR_INSTALL_ROOT)/lib
 
 CFLAGS = -g -Wall -DRT_CLIENT\
-	-I../include -I../mini-rpc -I$(WR_INCLUDE)
+	-I../include -I../libwr/include -I../mini-rpc -I$(WR_INCLUDE)
 
 ifdef WRS_HAL_DEBUG
   CFLAGS += -DDEBUG

userspace/wrsw_rtud/Makefile

@@ -14,7 +14,8 @@ WR_LIB = $(WR_INSTALL_ROOT)/lib
 
 CFLAGS		= -O2 -Wall -ggdb  \
 		-I../wrsw_hal \
-		-I../mini-rpc -I../include -I$(WR_INCLUDE) -I$(LINUX)/include
+		-I../mini-rpc -I../include -I../libwr/include \
+			-I$(WR_INCLUDE) -I$(LINUX)/include
 # -I$(CROSS_COMPILE_ARM_PATH)/../include
 
 ifdef WRS_RTUD_DEBUG