diff options
author | Petrica Manoila <petrica.manoila@continental-corporation.com> | 2014-08-29 09:43:48 +0200 |
---|---|---|
committer | Petrica Manoila <petrica.manoila@continental-corporation.com> | 2014-08-29 09:55:52 +0200 |
commit | a349b1fb4276882566b82d827d9290df3d2f8ad2 (patch) | |
tree | 03b96ffd9e3ecd0dd7c662234bf83a4dcc175eff /src | |
parent | 823125348b052fb313a428bdbcd3a2602ed89778 (diff) | |
download | persistence-common-object-a349b1fb4276882566b82d827d9290df3d2f8ad2.tar.gz |
PCO Vers. 1.0.1 - Split of the low level database access
Added separate folders (itzam, sqlite, rawdb) under src, for specific database access implementations.
Default database : itzam.
Use "./configure --with-sqlite" to build using the SQLITE db. Provide implementation in src/sqlite/pers_low_level_db_access.c
based on pers_low_level_db_access_if.h
Use "./configure --with-rawdb" to build using the RAWDB db. Provide implementation in src/rawdb/pers_low_level_db_access.c
based on pers_low_level_db_access_if.h
Change-Id: I4c32835fd1863b3d25bc35c54958905e2c535758
Signed-off-by: Petrica Manoila <petrica.manoila@continental-corporation.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 90 | ||||
-rw-r--r-- | src/itzam/pers_low_level_db_access.c (renamed from src/pers_low_level_db_access.c) | 0 | ||||
-rw-r--r-- | src/rawdb/pers_low_level_db_access.c | 1 | ||||
-rw-r--r-- | src/sqlite/pers_low_level_db_access.c | 1 |
4 files changed, 71 insertions, 21 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index c8bf708..c2a7a57 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,6 +3,7 @@ # Copyright (C) 2012 Continental Automotive Systems, Inc. # # Author: Ana.Chisca@continental-corporation.com +# Petrica.Manoila@continental-corporation.com # # Makefile template for the persistence common library # @@ -16,55 +17,102 @@ ACLOCAL_AMFLAGS=-I m4 +# Build objects into the subdirectory of the build directory corresponding to the subdirectory of the source files +# to avoid conflicts for pers_low_level_db_access.c files for different databases +AUTOMAKE_OPTIONS = subdir-objects + lib_LTLIBRARIES = libpers_common.la include_HEADERS= \ - $(top_srcdir)/inc/protected/persComTypes.h \ - $(top_srcdir)/inc/protected/persComDataOrg.h \ - $(top_srcdir)/inc/protected/persComDbAccess.h \ - $(top_srcdir)/inc/protected/persComErrors.h \ - $(top_srcdir)/inc/protected/persComRct.h \ - $(top_srcdir)/inc/protected/persComIpc.h + ../inc/protected/persComTypes.h \ + ../inc/protected/persComDataOrg.h \ + ../inc/protected/persComDbAccess.h \ + ../inc/protected/persComErrors.h \ + ../inc/protected/persComRct.h \ + ../inc/protected/persComIpc.h libpers_common_la_CFLAGS = \ - -I $(top_srcdir)/inc/private -I $(top_srcdir)/inc/protected -I $(top_srcdir)/generated\ + -I ../inc/private -I ../inc/protected -I ../generated\ $(DLT_CFLAGS) \ $(GIO_CFLAGS) \ $(GIO_UNIX_CFLAGS) \ $(GLIB_CFLAGS) \ $(GOBJECT_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(ITZAM_CFLAGS) + $(DBUS_CFLAGS) + +if HAVE_ITZAM +libpers_common_la_CFLAGS += \ + $(ITZAM_CFLAGS) +endif + +if HAVE_SQLITE +libpers_common_la_CFLAGS += \ + $(SQLITE_CFLAGS) +endif + +if HAVE_RAWDB +libpers_common_la_CFLAGS += \ + $(RAWDB_CFLAGS) +endif libpers_common_la_SOURCES = \ - $(top_srcdir)/generated/PasClientNotificationGen.c\ - $(top_srcdir)/src/pers_data_organization.c\ - $(top_srcdir)/src/pers_local_shared_db_access.c\ - $(top_srcdir)/src/pers_low_level_db_access.c\ - $(top_srcdir)/src/pers_resource_config_table.c\ - $(top_srcdir)/src/pers_ipc.c\ - $(top_srcdir)/src/pers_ipc_dbus.c + ../generated/PasClientNotificationGen.c\ + ../src/pers_data_organization.c\ + ../src/pers_local_shared_db_access.c\ + ../src/pers_resource_config_table.c\ + ../src/pers_ipc.c\ + ../src/pers_ipc_dbus.c + +if HAVE_ITZAM +libpers_common_la_SOURCES += \ + ../src/itzam/pers_low_level_db_access.c +endif + +if HAVE_SQLITE +libpers_common_la_SOURCES += \ + ../src/sqlite/pers_low_level_db_access.c +endif + +if HAVE_RAWDB +libpers_common_la_SOURCES += \ + ../src/rawdb/pers_low_level_db_access.c +endif libpers_common_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) + libpers_common_la_LIBADD = \ $(DLT_LIBS) \ $(GIO_LIBS) \ $(GIO_UNIX_LIBS) \ $(GLIB_LIBS) \ $(DBUS_LIBS) \ - $(GOBJECT_LIBS) \ - $(ITZAM_LIBS) + $(GOBJECT_LIBS) + +if HAVE_ITZAM +libpers_common_la_LIBADD += \ + $(ITZAM_LIBS) +endif + +if HAVE_SQLITE +libpers_common_la_LIBADD += \ + $(SQLITE_LIBS) +endif + +if HAVE_RAWDB +libpers_common_la_LIBADD += \ + $(RAWDB_LIBS) +endif -dbuspolicy_DATA = $(top_srcdir)/dbus_config/org.genivi.persistence.admin.conf +dbuspolicy_DATA = ../dbus_config/org.genivi.persistence.admin.conf # Export interface description of org.genivi.persistence.admin DBus interface -dbusinterfaces_DATA = $(top_srcdir)/dbus_specifications/org.genivi.persistence.admin.xml +dbusinterfaces_DATA = ../dbus_specifications/org.genivi.persistence.admin.xml EXTRA_DIST = $(dbuspolicy_DATA) \ $(dbusinterfaces_DATA) # pkgconfig pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = $(top_srcdir)/pkgconfig/libperscommon.pc +pkgconfig_DATA = ../pkgconfig/libperscommon.pc diff --git a/src/pers_low_level_db_access.c b/src/itzam/pers_low_level_db_access.c index 4bdfed0..4bdfed0 100644 --- a/src/pers_low_level_db_access.c +++ b/src/itzam/pers_low_level_db_access.c diff --git a/src/rawdb/pers_low_level_db_access.c b/src/rawdb/pers_low_level_db_access.c new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/rawdb/pers_low_level_db_access.c @@ -0,0 +1 @@ + diff --git a/src/sqlite/pers_low_level_db_access.c b/src/sqlite/pers_low_level_db_access.c new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/sqlite/pers_low_level_db_access.c @@ -0,0 +1 @@ + |