Merge "Makefiles: Add appropriate Makefiles to allow compilation on LE"

Makefile.am

+CLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = foreign
+SUBDIRS = rmnetctl/src rmnetctl/cli

configure.ac

+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+AC_PREREQ([2.65])
+AC_INIT(data-opensource, 1.0.0)
+AM_INIT_AUTOMAKE(data-opensource, 1.0.0)
+AC_OUTPUT(Makefile rmnetctl/src/Makefile rmnetctl/cli/Makefile data-opensource.pc)
+AC_CONFIG_SRCDIR([rmnetctl/src/librmnetctl.c])
+#AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
+
+# Checks for programs.
+AC_PROG_CC
+AC_PROG_LIBTOOL
+
+# Checks for libraries.
+AC_ARG_WITH(sanitized-headers,
+      AS_HELP_STRING([--with-sanitized-headers=DIR],
+         [Specify the location of the sanitized Linux headers]),
+      [CPPFLAGS="$CPPFLAGS -idirafter $withval"])
+
+AC_ARG_WITH([glib],
+      AC_HELP_STRING([--with-glib],
+         [enable glib, building HLOS systems which use glib]))
+
+if (test "x${with_glib}" = "xyes"); then
+        AC_DEFINE(ENABLE_USEGLIB, 1, [Define if HLOS systems uses glib])
+        PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.16, dummy=yes,
+                                AC_MSG_ERROR(GThread >= 2.16 is required))
+        PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16, dummy=yes,
+                                AC_MSG_ERROR(GLib >= 2.16 is required))
+        GLIB_CFLAGS="$GLIB_CFLAGS $GTHREAD_CFLAGS"
+        GLIB_LIBS="$GLIB_LIBS $GTHREAD_LIBS"
+        AC_SUBST(GLIB_CFLAGS)
+        AC_SUBST(GLIB_LIBS)
+fi
+
+AM_CONDITIONAL(USE_GLIB, test "x${with_glib}" = "xyes")
+
+# Checks for header files.
+AC_CHECK_HEADERS([sys/socket.h stdint.h linux/netlink.h string.h stdio.h unistd.h stdlib.h linux/rmnet_data.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_TYPE_OFF_T
+
+# Checks for library functions.
+AC_FUNC_MALLOC
+
+#AC_FUNC_MMAP
+#AC_CHECK_FUNCS([memset malloc sendto recvfrom ])
+AC_OUTPUT

data-opensource.pc.in

+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: data-opensource
+Description: Data Opensource Components
+Version: @VERSION@
+Libs: -L${libdir} -lrmnetctl
+Cflags: -I${includedir}/data-opensource

rmnetctl/cli/Makefile.am

+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)

rmnetctl/cli/rmnetcli.c

@@ -87,7 +87,7 @@ char rmnetcfg_error_code_text
 * @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");

rmnetctl/src/Makefile.am

+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

rmnetctl/src/librmnetctl.c

@@ -51,6 +51,11 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #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