sanders: gps: update to LA.UM.7.6.r1-02000-89xx.0 tag

gps/utils/Makefile.am

@@ -1,14 +1,17 @@
+ACLOCAL_AMFLAGS = -I m4
+
 AM_CFLAGS = -Wundef \
+        -MD \
+        -Wno-trigraphs \
+        -g -O0 \
+        -fno-inline \
+        -fno-short-enums \
+        -fpic \
          -I./ \
          -std=c++11 \
          $(LOCPLA_CFLAGS)
 
-AM_CPPFLAGS = -Wundef \
-         -I./ \
-         -std=c++11 \
-         $(LOCPLA_CFLAGS)
-
-libgps_utils_so_la_h_sources = \
+libgps_utils_la_h_sources = \
         msg_q.h \
         linked_list.h \
         loc_cfg.h \
@@ -19,13 +22,15 @@ libgps_utils_so_la_h_sources = \
         LocHeap.h \
         LocThread.h \
         LocTimer.h \
+        LocIpc.h \
         loc_misc_utils.h \
         loc_nmea.h \
         gps_extended_c.h \
         gps_extended.h \
-        loc_gps.h
+        loc_gps.h \
+        log_util.h
 
-libgps_utils_so_la_c_sources = \
+libgps_utils_la_c_sources = \
         linked_list.c \
         msg_q.c \
         loc_cfg.cpp \
@@ -34,31 +39,32 @@ libgps_utils_so_la_c_sources = \
         LocHeap.cpp \
         LocTimer.cpp \
         LocThread.cpp \
+        LocIpc.cpp \
         MsgTask.cpp \
         loc_misc_utils.cpp \
         loc_nmea.cpp
 
+library_includedir = $(pkgincludedir)
 
-library_include_HEADERS = $(libgps_utils_so_la_h_sources)
+library_include_HEADERS = $(libgps_utils_la_h_sources)
 
-libgps_utils_so_la_SOURCES = $(libgps_utils_so_la_c_sources)
+libgps_utils_la_SOURCES = $(libgps_utils_la_c_sources)
 
 if USE_GLIB
-libgps_utils_so_la_CFLAGS = -DUSE_GLIB $(AM_CFLAGS) @GLIB_CFLAGS@
-libgps_utils_so_la_LDFLAGS = -lstdc++ -Wl,-z,defs -lpthread @GLIB_LIBS@ -shared -version-info 1:0:0
-libgps_utils_so_la_CPPFLAGS = -DUSE_GLIB $(AM_CFLAGS) $(AM_CPPFLAGS) @GLIB_CFLAGS@
+libgps_utils_la_CFLAGS = -DUSE_GLIB $(AM_CFLAGS) @GLIB_CFLAGS@
+libgps_utils_la_LDFLAGS = -lstdc++ -Wl,-z,defs -lpthread @GLIB_LIBS@ -shared -version-info 1:0:0
+libgps_utils_la_CPPFLAGS = -DUSE_GLIB $(AM_CFLAGS) $(AM_CPPFLAGS) @GLIB_CFLAGS@
 else
-libgps_utils_so_la_CFLAGS = $(AM_CFLAGS)
-libgps_utils_so_la_LDFLAGS = -Wl,-z,defs -lpthread -shared -version-info 1:0:0
-libgps_utils_so_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS)
+libgps_utils_la_CFLAGS = $(AM_CFLAGS)
+libgps_utils_la_LDFLAGS = -Wl,-z,defs -lpthread -shared -version-info 1:0:0
+libgps_utils_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS)
 endif
 
-libgps_utils_so_la_LIBADD = -lcutils -lstdc++ -llog $(LOCPLA_LIBS)
+libgps_utils_la_LIBADD = $(CUTILS_LIBS)
 
 #Create and Install libraries
-lib_LTLIBRARIES = libgps_utils_so.la
-library_includedir = $(pkgincludedir)
-pkgconfigdir = $(libdir)/pkgconfig
+lib_LTLIBRARIES = libgps_utils.la
 
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gps-utils.pc
 EXTRA_DIST = $(pkgconfig_DATA)