diff --git a/Makefile b/Makefile
index 67abf954cf8f5e4ce4e38dca8ca505ba29209adb..bdec34d2aeecd948d860845b41921dafec7f1d18 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,8 @@
 CC		= gcc
 CWFLAGS		= -g -Wall
 CFLAGS	       += "-I$(STAGING_DIR)/usr/include/libxml2/"
-LIBS		= -ljson-c -lubox -lubus -lcurl -lblobmsg_json -lxml2
-# -lmobile_zte -lmobile_hilink
-all: libmobile1_zte libmobile2_zte libmobile1_hilink libmobile2_hilink common stack_operations dongle_infrastructure dongle
+LIBS		= -ljson-c -lubox -lubus -lcurl -lblobmsg_json -lxml2 -lmobile_zte -lmobile_hilink -lmobile
+all: libmobile1_zte libmobile2_zte libmobile1_hilink libmobile2_hilink libmobile1 libmobile2 common stack_operations dongle_infrastructure dongle
 
 ZOBJS		= libmobile_zte.o
 ZSRCS		= libmobile_zte.c
@@ -19,12 +18,20 @@ libmobile1_hilink: ${HLOBJS}
 	${CC} -c ${CFLAGS} -fPIC ${HLSRCS} -o ${HLOBJS}
 
 libmobile2_hilink: ${HLOBJS}
-	${CC} ${HLOBJS} -shared -o libmobile_hilink.so
+	${CC} ${CFLAGS} ${HLOBJS} -shared -o libmobile_hilink.so
+
+LOBJS		= libmobile_wrapper.o
+LSRCS		= libmobile_wrapper.c
+libmobile1: ${LOBJS}
+	${CC} -c ${CFLAGS} -fPIC ${LSRCS} -o ${LOBJS}
+
+libmobile2: ${LOBJS}
+	${CC} ${CFLAGS} ${LOBJS} -shared -o libmobile.so
 
 COBJS		= common.o
 CSRCS		= common.c
 common: ${COBJS}
-	${CC} -c ${CFLAGS} ${CSRCS} -o ${COBJS} -lmobile_zte
+	${CC} -c ${CFLAGS} ${CSRCS} -o ${COBJS} ${LIBS}
 
 STOBJS		= stack_operations.o
 STSRCS		= stack_operations.c
@@ -34,10 +41,10 @@ stack_operations: ${STOBJS}
 DIOBJS		= dongle_infrastructure.o
 DISRCS		= dongle_infrastructure.c
 dongle_infrastructure: ${DIOBJS}
-	${CC} -c ${CWFLAGS} ${CFLAGS} ${DISRCS} ${STOBJS} ${COBJS} -o ${DIOBJS} -L . ${LIBS} -lmobile_zte
+	${CC} -c ${CWFLAGS} ${CFLAGS} ${DISRCS} ${STOBJS} ${COBJS} -o ${DIOBJS} -L . ${LIBS}
 
 dongle: dongle.o
-	${CC} ${CWFLAGS} ${CFLAGS} dongle.o ${DIOBJS} ${STOBJS} ${COBJS} -o dongle -L . ${LIBS} -lmobile_zte
+	${CC} ${CWFLAGS} ${CFLAGS} dongle.o ${DIOBJS} ${STOBJS} ${COBJS} -o dongle -L . ${LIBS}
 
 clean:
 	rm -f dongle_apn dongle_pin dongle_network *.o *.so