From eb3a3046833c40232eab3cb3ca06ebe535f8405a Mon Sep 17 00:00:00 2001
From: ChenLing <chenlinghy@cmhi.chinamobile.com>
Date: Thu, 25 Jul 2019 14:19:28 +0800
Subject: [PATCH] =?UTF-8?q?Mod=20=20aaa-12=20=E5=88=A0=E9=99=A4user.userha?=
 =?UTF-8?q?sh.Makefile=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BF=AE=E6=94=B9=20user?=
 =?UTF-8?q?.web-auth.Makefile=E6=96=87=E4=BB=B6=20RCA=EF=BC=9A=20SOL?=
 =?UTF-8?q?=EF=BC=9A=20=E4=BF=AE=E6=94=B9=E4=BA=BA=EF=BC=9Achenling=20?=
 =?UTF-8?q?=E6=A3=80=E8=A7=86=E4=BA=BA=EF=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Product/build/user.userhash.Makefile | 77 ----------------------------
 Product/build/user.web-auth.Makefile |  8 +--
 2 files changed, 4 insertions(+), 81 deletions(-)
 delete mode 100644 Product/build/user.userhash.Makefile

diff --git a/Product/build/user.userhash.Makefile b/Product/build/user.userhash.Makefile
deleted file mode 100644
index 60bc6d183..000000000
--- a/Product/build/user.userhash.Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-# target name, the target name must have the same name of c source file
-TARGET_NAME=userhash
-
-# target 
-# for linux module driver: KO
-# for application: EXE
-# for dynamic library: DLL
-TARGET_TYPE = DLL
- 
-# target object
-# for application: APP
-# for device driver: DRV
-TARGET_OBJ  = APP
-
-# custom install dir
-TARGET_BOX = 
-
-#debug mode or release mode
-DEBUG 			= TRUE
-
-PLAT_LINUX		?= TRUE
-PLAT_ARM64		?= TRUE
-
-VPATH = ../../Product/user/user_auth
-
-# source code
-
-# set the source file, don't used .o because of ...
-
-COMMON_SRCS = user_hashtable.c
-
-# MRS Board Source Files
-PLAT_LINUX_SRCS = $(COMMON_SRCS)
-PLAT_ARM64_SRCS = $(COMMON_SRCS)
-
-# gcc CFLAGS
-PLAT_ARM64_CFLAGS := -fPIC  -I../../Common -I../../Product/common
-PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS)
-
-
-PLAT_ARM64_LDFLAGS  := -fPIC -shared 
-PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS)
-
-
-#gcc libs
-ARM64_LIBS		:= -lcjson -lpthread -lm
-LINUX_LIBS		:= -lcjson -lpthread -lm
-
-ifeq	($(PLAT_ARM64), TRUE)
-DEPEND_LIB			+= 
-USER_CLEAN_ITEMS	+=
-endif
-
-ifeq	($(PLAT_LINUX), TRUE)
-DEPEND_LIB			+=
-USER_CLEAN_ITEMS	+=
-endif
-
-# this line must be at below of thus, because of...	
-include ../../Common/common.Makefile
-
-ifneq ($(MAKECMDGOALS), clean)
-ifneq ($(MAKECMDGOALS), cleanall)
-ifneq ($(notdir $(DEPEND_LIB)), $(wildcard $(DEPEND_LIB)))
-$(shell $(CP) $(DEPEND_LIB) ./)
-endif
-endif
-endif
-
-ifeq ($(MAKECMDGOALS), )
-$(shell find ./ -name "$(TARGET)-*.ko" -delete)
-else
-ifeq ($(MAKECMDGOALS), all)
-$(shell find ./ -name "$(TARGET)-*.ko" -delete)
-endif
-endif
-
diff --git a/Product/build/user.web-auth.Makefile b/Product/build/user.web-auth.Makefile
index 157a0e19b..e5ef623ad 100644
--- a/Product/build/user.web-auth.Makefile
+++ b/Product/build/user.web-auth.Makefile
@@ -27,7 +27,7 @@ VPATH = ../user/user_auth
 
 # set the source file, don't used .o because of ...
 
-COMMON_SRCS = web_auth.c
+COMMON_SRCS = web_auth.c user_hashtable.c
 
 # MRS Board Source Files
 PLAT_LINUX_SRCS = $(COMMON_SRCS)
@@ -44,7 +44,7 @@ PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS)
 
 #gcc libs
 ARM64_LIBS		:= ./userauthapi-arm64.so 
-LINUX_LIBS		:= -lcjson ./userauthapi-linux.so ./userhash-linux.so
+LINUX_LIBS		:= -lcjson ./userauthapi-linux.so 
 
 ifeq	($(PLAT_ARM64), TRUE)
 DEPEND_LIB			+= ./debug/userauthapi-arm64.so
@@ -52,8 +52,8 @@ USER_CLEAN_ITEMS	+= ./userauthapi-arm64.so
 endif
 
 ifeq	($(PLAT_LINUX), TRUE)
-DEPEND_LIB			+= ./debug/userauthapi-linux.so  ./debug/userhash-linux.so
-USER_CLEAN_ITEMS	+= ./userauthapi-linux.so ./userhash-linux.so
+DEPEND_LIB			+= ./debug/userauthapi-linux.so  
+USER_CLEAN_ITEMS	+= ./userauthapi-linux.so 
 endif
 
 # this line must be at below of thus, because of...