diff --git a/rmnetctl/cli/Makefile.am b/rmnetctl/cli/Makefile.am
new file mode 100644
index 0000000..a17b79e
--- /dev/null
+++ b/rmnetctl/cli/Makefile.am
@@ -0,0 +1,9 @@
+AM_CFLAGS = -Wall -Werror -Wundef -Wstrict-prototypes -Wno-trigraphs
+AM_CFLAGS += -I./../inc
+rmnetcli_SOURCES = rmnetcli.c
+bin_PROGRAMS = rmnetcli
+requiredlibs = ../src/librmnetctl.la
+rmnetcli_LDADD = $(requiredlibs)
+LOCAL_MODULE := librmnetctl
+LOCAL_PRELINK_MODULE := false
+include $(BUILD_SHARED_LIBRARY)
diff --git a/rmnetctl/cli/rmnetcli.c b/rmnetctl/cli/rmnetcli.c
index 2c4d099..7fe8a60 100644
--- a/rmnetctl/cli/rmnetcli.c
+++ b/rmnetctl/cli/rmnetcli.c
@@ -87,7 +87,7 @@
 * @param void
 * @return void
 */
-static void rmnet_api_usage()
+static void rmnet_api_usage(void)
 {
 	printf("RmNet API Usage:\n\n");
 	printf("rmnetcli help                            Displays this help\n");
diff --git a/rmnetctl/src/Makefile.am b/rmnetctl/src/Makefile.am
new file mode 100644
index 0000000..5f4ff95
--- /dev/null
+++ b/rmnetctl/src/Makefile.am
@@ -0,0 +1,16 @@
+AM_CFLAGS = -Wall -Werror -Wundef -Wstrict-prototypes -Wno-trigraphs
+AM_CFLAGS += -I./../inc
+
+librmnetctl_la_C = @C@
+librmnetctl_la_SOURCES = librmnetctl.c
+
+common_CFLAGS =  -DUSE_GLIB @GLIB_CFLAGS@
+common_LDFLAGS = -lpthread -lrt @GLIB_LIBS@
+
+librmnetctl_la_CFLAGS := $(AM_CFLAGS) $(common_CFLAGS)
+librmnetctl_la_LDFLAGS := -shared $(common_LDFLAGS)
+
+library_includedir = $(pkgincludedir)
+library_include_HEADERS = ./../inc/librmnetctl.h
+
+lib_LTLIBRARIES = librmnetctl.la
diff --git a/rmnetctl/src/librmnetctl.c b/rmnetctl/src/librmnetctl.c
index 91d7711..ea94d06 100644
--- a/rmnetctl/src/librmnetctl.c
+++ b/rmnetctl/src/librmnetctl.c
@@ -51,6 +51,11 @@
 #include "librmnetctl_hndl.h"
 #include "librmnetctl.h"
 
+#ifdef USE_GLIB
+#include <glib.h>
+#define strlcpy g_strlcpy
+#endif
+
 #define RMNETCTL_SOCK_FLAG 0
 #define ROOT_USER_ID 0
 #define MIN_VALID_PROCESS_ID 0