diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-03-06 16:33:07 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-03-06 16:33:25 +0100 |
| commit | cad422afb7a4dcd7592c502641b41a832703e536 (patch) | |
| tree | aeabe11ef20dd4763f983dd4fc59f76f5cee7e62 /RepositoryExternal.mk | |
| parent | ea66024d4da38a619f44c941b65e6a28b74214b9 (diff) | |
Adding libmariadb module for internal mariadb (work in progress)
Change-Id: If2cf9ff21120e29a149903e8eab849d97fa0c2c9
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 38 |
1 files changed, 35 insertions, 3 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 869e17936efd..2e36e94e4881 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -38,6 +38,39 @@ # External headers +ifeq ($(SYSTEM_MARIADB),YES) + +define gb_LinkTarget__use_mariadb +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(MARIADB_CFLAGS) \ +) +$(call gb_LinkTarget_add_libs,$(1),$(MARIADB_LIBS)) + +endef +gb_ExternalProject__use_mariadb := + +else # !SYSTEM_MARIADB + +$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ + mariadblib \ +)) + +define gb_LinkTarget__use_mariadb +$(call gb_LinkTarget_use_static_libraries,$(1),\ + mariadblib \ +) + +endef +define gb_ExternalProject__use_mariadb +$(call gb_ExternalProject_use_package,$(1),libmariadb_inc) +$(call gb_ExternalProject_use_static_libraries,$(1),mariadblib) + +endef + +endif # SYSTEM_MARIADB + + ifeq ($(SYSTEM_MESA_HEADERS),YES) gb_LinkTarget__use_mesa_headers := @@ -192,11 +225,11 @@ $(call gb_LinkTarget_add_defs,$(1),\ ) $(call gb_LinkTarget_add_libs,$(1),\ - $(MARIADB_LIB) \ + $(MARIADB_LIBS) \ ) $(call gb_LinkTarget_set_include,$(1),\ - $(MARIADB_INC) \ + $(MARIADB_CFLAGS) \ $$(INCLUDE) \ ) endef @@ -206,7 +239,6 @@ else define gb_LinkTarget__use_mysql $(call gb_LinkTarget_set_include,$(1),\ - -I$(LIBMARIADB_PATH)/mariadbclient/include \ $$(INCLUDE) \ ) |