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: move libwr headers from include/libwr to libwr/include/libwr
Also, fix Makefiles accordingly. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
e56732ec · Adam Wujek · Alessandro Rubini · 66d08b81 · e56732ec · e56732ec
Commit e56732ec authored Nov 20, 2014 by Adam Wujek 💬 Committed by Alessandro Rubini Nov 20, 2014
15 changed files
--- a/userspace/libwr/Makefile
+++ b/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 \

--- a/userspace/include/libwr/fan.h
+++ b/userspace/include/libwr/fan.h
--- a/userspace/include/libwr/hal_client.h
+++ b/userspace/include/libwr/hal_client.h
--- a/userspace/include/libwr/hwiu.h
+++ b/userspace/include/libwr/hwiu.h
--- a/userspace/include/libwr/pio.h
+++ b/userspace/include/libwr/pio.h
--- a/userspace/include/libwr/pps_gen.h
+++ b/userspace/include/libwr/pps_gen.h
--- a/userspace/include/libwr/ptpd_netif.h
+++ b/userspace/include/libwr/ptpd_netif.h
--- a/userspace/include/libwr/sfp_lib.h
+++ b/userspace/include/libwr/sfp_lib.h
--- a/userspace/include/libwr/shw_io.h
+++ b/userspace/include/libwr/shw_io.h
--- a/userspace/include/libwr/switch_hw.h
+++ b/userspace/include/libwr/switch_hw.h
--- a/userspace/include/libwr/trace.h
+++ b/userspace/include/libwr/trace.h
--- a/userspace/include/libwr/util.h
+++ b/userspace/include/libwr/util.h
--- a/userspace/tools/Makefile
+++ b/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

--- a/userspace/wrsw_hal/Makefile
+++ b/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

--- a/userspace/wrsw_rtud/Makefile
+++ b/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