userspace/libwr: fix makefiles in other components depending on libwr

userspace/Makefile

@@ -12,7 +12,7 @@ WR_INSTALL_ROOT ?= $(WRS_OUTPUT_DIR)/images/wr
 WRDEV_DIR ?= $(WRS_BASE_DIR)/..
 
 # subdirectories we want to compile
-SUBDIRS = libptpnetif mini-rpc libswitchhw libsdb \
+SUBDIRS = libwr mini-rpc libsdb \
 	wrsw_hal wrsw_rtud tools snmpd
 
 # all variables are exported

userspace/tools/Makefile

@@ -25,7 +25,7 @@ GIT_USR = $(shell  git config --get-all user.name)
 CFLAGS =  -O2 -g -Wall \
 		-I$(LINUX)/include \
 		-I$(LINUX)/arch/arm/mach-at91/include \
-		-I../libptpnetif \
+		-I../libwr \
 		-I../wrsw_hal \
 		-I../wrsw_rtud \
 		-I../mini-rpc \
@@ -37,10 +37,9 @@ ifdef WRS_TOOLS_DEBUG
 endif
 
 LDFLAGS = -L../mini-rpc \
-		-L../libptpnetif \
-		-L../libswitchhw \
+		-L../libwr \
 		-L../libsdb \
-		-lminipc -lptpnetif -lswitchhw -lsdbfs -llua -lm -ldl
+		-lminipc -lwr -lsdbfs -llua -lm -ldl
 
 all: 	$(TOOLS)
 

userspace/wrsw_hal/Makefile

@@ -18,8 +18,8 @@ ifdef WRS_HAL_DEBUG
   CFLAGS += -DDEBUG
 endif
 
-LDFLAGS = -L../libswitchhw -L../mini-rpc \
-	 -lminipc -llua -lm -ldl -lswitchhw 
+LDFLAGS = -L../libwr -L../mini-rpc \
+	 -lminipc -llua -lm -ldl -lwr 
 
 all: $(BINARY)
 

userspace/wrsw_rtud/Makefile

@@ -13,7 +13,7 @@ WR_INCLUDE = $(WR_INSTALL_ROOT)/include
 WR_LIB = $(WR_INSTALL_ROOT)/lib
 
 CFLAGS		= -O2 -Wall -ggdb  \
-		-I../libptpnetif -I../wrsw_hal \
+		-I../libwr -I../wrsw_hal \
 		-I../mini-rpc -I../include -I$(WR_INCLUDE) -I$(LINUX)/include
 # -I$(CROSS_COMPILE_ARM_PATH)/../include
 
@@ -22,8 +22,8 @@ ifdef WRS_RTUD_DEBUG
 endif
 
 
-LDFLAGS 	:= -L../libptpnetif -L../libswitchhw -L../mini-rpc\
-		-lswitchhw -lptpnetif -lpthread -lminipc
+LDFLAGS 	:= -L../libwr -L../mini-rpc\
+		-lwr -lpthread -lminipc
 
 RM 	    := rm -f