loc-api: Merging Makefiles of libloc_api_50001 and loc_api_v02
Created a new Makefile.am that builds both libloc_api_50001 and loc_api_v02 Change-Id: I20960f1c087c9a6bf721ea3e25369590f5b2ce85
This commit is contained in:
Pandari Sabhapathi
Dongmei Wang
parent
e2bcdc300e
commit
70b94ae2c1
5 changed files with 125 additions and 85 deletions
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
SUBDIRS = utils loc_api/libloc_api_50001 loc_api/loc_api_v02
|
||||
SUBDIRS = utils loc_api
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = loc-api.pc
|
||||
|
|
|
|||
|
|
@ -77,8 +77,7 @@ AM_CONDITIONAL(USE_GLIB, test "x${with_glib}" = "xyes")
|
|||
AC_CONFIG_FILES([ \
|
||||
Makefile \
|
||||
utils/Makefile \
|
||||
loc_api/libloc_api_50001/Makefile \
|
||||
loc_api/loc_api_v02/Makefile \
|
||||
loc_api/Makefile \
|
||||
loc-api.pc \
|
||||
])
|
||||
|
||||
|
|
|
|||
|
|
@ -6,5 +6,5 @@ includedir=@includedir@
|
|||
Name: loc-api
|
||||
Description: Qualcomm GPS Location API
|
||||
Version: @VERSION@
|
||||
Libs: -L${libdir} -lgps_utils_so -lloc_adapter_so -lloc_eng_so -lgps_default_so -lloc_api
|
||||
Cflags: -I${includedir}/loc-api/libloc_api_50001 -I${includedir}/loc-api/utils -I${includedir}/ -I${includedir}/loc-api
|
||||
Libs: -L${libdir} -lgps_utils_so -lloc_adapter_so -lloc_api -lloc_eng_so -lgps_default_so
|
||||
Cflags: -I${includedir}/loc-api/utils -I${includedir}/ -I${includedir}/loc-api
|
||||
|
|
|
|||
121
loc_api/Makefile.am
Normal file
121
loc_api/Makefile.am
Normal file
|
|
@ -0,0 +1,121 @@
|
|||
AM_CFLAGS = \
|
||||
$(QMIF_CFLAGS) \
|
||||
-I../utils \
|
||||
-I../platform_lib_abstractions \
|
||||
-I./ulp/inc \
|
||||
-I./libloc_api_50001 \
|
||||
-I./loc_api_v02 \
|
||||
-I./ \
|
||||
-fno-short-enums \
|
||||
-DFEATURE_GNSS_BIT_API
|
||||
|
||||
libloc_adapter_so_la_SOURCES = \
|
||||
libloc_api_50001/loc_eng_log.cpp \
|
||||
libloc_api_50001/LocApiAdapter.cpp \
|
||||
fake_property_service.c \
|
||||
fake_sched_policy.c
|
||||
|
||||
if USE_GLIB
|
||||
libloc_adapter_so_la_CFLAGS = -DUSE_GLIB $(AM_CFLAGS) @GLIB_CFLAGS@
|
||||
libloc_adapter_so_la_LDFLAGS = -lstdc++ -lpthread @GLIB_LIBS@ -shared -version-info 1:0:0
|
||||
libloc_adapter_so_la_CPPFLAGS = -DUSE_GLIB $(AM_CFLAGS) $(AM_CPPFLAGS) @GLIB_CFLAGS@
|
||||
else
|
||||
libloc_adapter_so_la_CFLAGS = $(AM_CFLAGS)
|
||||
libloc_adapter_so_la_LDFLAGS = -lpthread -shared -version-info 1:0:0
|
||||
libloc_adapter_so_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS)
|
||||
endif
|
||||
libloc_adapter_so_la_LIBADD = -lstdc++ ../utils/libgps_utils_so.la
|
||||
|
||||
|
||||
libloc_api_la_SOURCES = \
|
||||
loc_api_v02/LocApiV02Adapter.cpp \
|
||||
loc_api_v02/loc_api_v02_log.c \
|
||||
loc_api_v02/loc_api_v02_client.c \
|
||||
loc_api_v02/loc_api_sync_req.c \
|
||||
loc_api_v02/location_service_v02.c \
|
||||
loc_api_v02/LocApiV02Adapter.h \
|
||||
loc_api_v02/loc_util_log.h \
|
||||
loc_api_v02/location_service_v02.h \
|
||||
loc_api_v02/loc_api_sync_req.h \
|
||||
loc_api_v02/loc_api_v02_client.h \
|
||||
loc_api_v02/loc_api_v02_log.h
|
||||
|
||||
if USE_GLIB
|
||||
libloc_api_la_CFLAGS = -DUSE_GLIB $(AM_CFLAGS) @GLIB_CFLAGS@
|
||||
libloc_api_la_LDFLAGS = -lstdc++ -lpthread @GLIB_LIBS@ -shared -version-info 1:0:0
|
||||
libloc_api_la_CPPFLAGS = -DUSE_GLIB $(AM_CFLAGS) $(AM_CPPFLAGS) @GLIB_CFLAGS@
|
||||
else
|
||||
libloc_api_la_CFLAGS = $(AM_CFLAGS)
|
||||
libloc_api_la_LDFLAGS = -shared -version-info 1:0:0
|
||||
libloc_api_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS)
|
||||
endif
|
||||
|
||||
libloc_api_la_LIBADD = -lstdc++ $(QMIF_LIBS) ../utils/libgps_utils_so.la libloc_adapter_so.la
|
||||
|
||||
libloc_eng_so_la_SOURCES = \
|
||||
libloc_api_50001/loc_eng.cpp \
|
||||
libloc_api_50001/loc_eng_agps.cpp \
|
||||
libloc_api_50001/loc_eng_xtra.cpp \
|
||||
libloc_api_50001/loc_eng_ni.cpp \
|
||||
libloc_api_50001/loc_eng_log.cpp \
|
||||
libloc_api_50001/loc_eng_dmn_conn.cpp \
|
||||
libloc_api_50001/loc_eng_dmn_conn_handler.cpp \
|
||||
libloc_api_50001/loc_eng_dmn_conn_thread_helper.c \
|
||||
libloc_api_50001/loc_eng_dmn_conn_glue_msg.c \
|
||||
libloc_api_50001/loc_eng_dmn_conn_glue_pipe.c \
|
||||
fake_property_service.c
|
||||
|
||||
|
||||
if USE_GLIB
|
||||
libloc_eng_so_la_CFLAGS = -DUSE_GLIB $(AM_CFLAGS) @GLIB_CFLAGS@
|
||||
libloc_eng_so_la_LDFLAGS = -lstdc++ -lpthread @GLIB_LIBS@ -shared -version-info 1:0:0
|
||||
libloc_eng_so_la_CPPFLAGS = -DUSE_GLIB $(AM_CFLAGS) $(AM_CPPFLAGS) @GLIB_CFLAGS@
|
||||
else
|
||||
libloc_eng_so_la_CFLAGS = $(AM_CFLAGS)
|
||||
libloc_eng_so_la_LDFLAGS = -lpthread -shared -version-info 1:0:0
|
||||
libloc_eng_so_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS)
|
||||
endif
|
||||
|
||||
libloc_eng_so_la_LIBADD = -lstdc++ -ldl ../utils/libgps_utils_so.la libloc_adapter_so.la libloc_api.la
|
||||
|
||||
|
||||
libgps_default_so_la_SOURCES = \
|
||||
libloc_api_50001/loc.cpp \
|
||||
libloc_api_50001/gps.c \
|
||||
fake_property_service.c
|
||||
|
||||
if USE_GLIB
|
||||
libgps_default_so_la_CFLAGS = -DUSE_GLIB $(AM_CFLAGS) @GLIB_CFLAGS@
|
||||
libgps_default_so_la_LDFLAGS = -lstdc++ -lpthread @GLIB_LIBS@ -shared -version-info 1:0:0
|
||||
libgps_default_so_la_CPPFLAGS = -DUSE_GLIB $(AM_CFLAGS) $(AM_CPPFLAGS) @GLIB_CFLAGS@
|
||||
else
|
||||
libgps_default_so_la_CFLAGS = $(AM_CFLAGS)
|
||||
libgps_default_so_la_LDFLAGS = -lpthread -shared -version-info 1:0:0
|
||||
libgps_default_so_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS)
|
||||
endif
|
||||
|
||||
libgps_default_so_la_LIBADD = -lstdc++ ../utils/libgps_utils_so.la -ldl libloc_eng_so.la
|
||||
|
||||
library_include_HEADERS = \
|
||||
libloc_api_50001/LocApiAdapter.h \
|
||||
libloc_api_50001/loc.h \
|
||||
libloc_api_50001/loc_eng.h \
|
||||
libloc_api_50001/loc_eng_xtra.h \
|
||||
libloc_api_50001/loc_eng_ni.h \
|
||||
libloc_api_50001/loc_eng_agps.h \
|
||||
libloc_api_50001/loc_eng_msg.h \
|
||||
libloc_api_50001/loc_eng_msg_id.h \
|
||||
libloc_api_50001/loc_eng_log.h \
|
||||
loc_api_v02/LocApiV02Adapter.h \
|
||||
loc_api_v02/loc_util_log.h \
|
||||
loc_api_v02/location_service_v02.h \
|
||||
loc_api_v02/loc_api_sync_req.h \
|
||||
loc_api_v02/loc_api_v02_client.h \
|
||||
loc_api_v02/loc_api_v02_log.h \
|
||||
ulp/inc/ulp.h \
|
||||
fake_property_service.h
|
||||
|
||||
library_includedir = $(pkgincludedir)
|
||||
|
||||
#Create and Install libraries
|
||||
lib_LTLIBRARIES = libloc_adapter_so.la libloc_api.la libloc_eng_so.la libgps_default_so.la
|
||||
|
|
@ -1,80 +0,0 @@
|
|||
AM_CFLAGS = \
|
||||
-I../../utils \
|
||||
-I../../platform_lib_abstractions \
|
||||
-I../ \
|
||||
-fno-short-enums \
|
||||
-DFEATURE_GNSS_BIT_API
|
||||
|
||||
libloc_adapter_so_la_SOURCES = loc_eng_log.cpp LocEngAdapter.cpp ../fake_property_service.c ../fake_sched_policy.c
|
||||
|
||||
if USE_GLIB
|
||||
libloc_adapter_so_la_CFLAGS = -DUSE_GLIB $(AM_CFLAGS) @GLIB_CFLAGS@
|
||||
libloc_adapter_so_la_LDFLAGS = -lstdc++ -lpthread @GLIB_LIBS@ -shared -version-info 1:0:0
|
||||
libloc_adapter_so_la_CPPFLAGS = -DUSE_GLIB $(AM_CFLAGS) $(AM_CPPFLAGS) @GLIB_CFLAGS@
|
||||
else
|
||||
libloc_adapter_so_la_CFLAGS = $(AM_CFLAGS)
|
||||
libloc_adapter_so_la_LDFLAGS = -lpthread -shared -version-info 1:0:0
|
||||
libloc_adapter_so_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS)
|
||||
endif
|
||||
libloc_adapter_so_la_LIBADD = -lstdc++ ../../utils/libgps_utils_so.la
|
||||
|
||||
|
||||
libloc_eng_so_la_SOURCES = \
|
||||
loc_eng.cpp \
|
||||
loc_eng_agps.cpp \
|
||||
loc_eng_xtra.cpp \
|
||||
loc_eng_ni.cpp \
|
||||
loc_eng_log.cpp \
|
||||
loc_eng_dmn_conn.cpp \
|
||||
loc_eng_dmn_conn_handler.cpp \
|
||||
loc_eng_dmn_conn_thread_helper.c \
|
||||
loc_eng_dmn_conn_glue_msg.c \
|
||||
loc_eng_dmn_conn_glue_pipe.c \
|
||||
../fake_property_service.c
|
||||
|
||||
|
||||
if USE_GLIB
|
||||
libloc_eng_so_la_CFLAGS = -DUSE_GLIB $(AM_CFLAGS) @GLIB_CFLAGS@
|
||||
libloc_eng_so_la_LDFLAGS = -lstdc++ -lpthread @GLIB_LIBS@ -shared -version-info 1:0:0
|
||||
libloc_eng_so_la_CPPFLAGS = -DUSE_GLIB $(AM_CFLAGS) $(AM_CPPFLAGS) @GLIB_CFLAGS@
|
||||
else
|
||||
libloc_eng_so_la_CFLAGS = $(AM_CFLAGS)
|
||||
libloc_eng_so_la_LDFLAGS = -lpthread -shared -version-info 1:0:0
|
||||
libloc_eng_so_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS)
|
||||
endif
|
||||
|
||||
libloc_eng_so_la_LIBADD = -lstdc++ -ldl ../../utils/libgps_utils_so.la libloc_adapter_so.la
|
||||
|
||||
|
||||
libgps_default_so_la_SOURCES = \
|
||||
loc.cpp \
|
||||
gps.c \
|
||||
../fake_property_service.c
|
||||
|
||||
if USE_GLIB
|
||||
libgps_default_so_la_CFLAGS = -DUSE_GLIB $(AM_CFLAGS) @GLIB_CFLAGS@
|
||||
libgps_default_so_la_LDFLAGS = -lstdc++ -lpthread @GLIB_LIBS@ -shared -version-info 1:0:0
|
||||
libgps_default_so_la_CPPFLAGS = -DUSE_GLIB $(AM_CFLAGS) $(AM_CPPFLAGS) @GLIB_CFLAGS@
|
||||
else
|
||||
libgps_default_so_la_CFLAGS = $(AM_CFLAGS)
|
||||
libgps_default_so_la_LDFLAGS = -lpthread -shared -version-info 1:0:0
|
||||
libgps_default_so_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS)
|
||||
endif
|
||||
|
||||
libgps_default_so_la_LIBADD = -lstdc++ ../../utils/libgps_utils_so.la -ldl libloc_eng_so.la
|
||||
|
||||
library_include_HEADERS = \
|
||||
LocEngAdapter.h \
|
||||
loc.h \
|
||||
loc_eng.h \
|
||||
loc_eng_xtra.h \
|
||||
loc_eng_ni.h \
|
||||
loc_eng_agps.h \
|
||||
loc_eng_msg.h \
|
||||
loc_eng_log.h
|
||||
../fake_property_service.h
|
||||
|
||||
library_includedir = $(pkgincludedir)/libloc_api_50001
|
||||
|
||||
#Create and Install libraries
|
||||
lib_LTLIBRARIES = libloc_adapter_so.la libloc_eng_so.la libgps_default_so.la
|
||||
Loading…
Reference in a new issue