diff options
| author | David Tardon <dtardon@redhat.com> | 2013-11-05 06:49:33 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-11-05 06:49:33 +0100 |
| commit | 217eae4f1f7d6f5c6d8efd3d86aa45e70ebee93f (patch) | |
| tree | a1c43216f7fda20beef9701175ab1a3ce8c686c2 /RepositoryExternal.mk | |
| parent | 80b419153732e8b49c560e88b174785db4adb556 (diff) | |
move mariadb to libs section
Change-Id: Ie78ea961a32e96c90bb674766b24a0c44d27412c
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index b633fa0e3180..72604a140d0c 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -29,38 +29,6 @@ # 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 - -define gb_LinkTarget__use_mariadb -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - $(MARIADB_CFLAGS) \ -) -$(call gb_LinkTarget_use_static_libraries,$(1),\ - mariadblib \ -) - -endef -define gb_ExternalProject__use_mariadb -$(call gb_ExternalProject_use_static_libraries,$(1),mariadblib) - -endef - -endif # SYSTEM_MARIADB - - ifeq ($(SYSTEM_MESA_HEADERS),YES) gb_LinkTarget__use_mesa_headers := @@ -221,6 +189,38 @@ endef 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 + +define gb_LinkTarget__use_mariadb +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(MARIADB_CFLAGS) \ +) +$(call gb_LinkTarget_use_static_libraries,$(1),\ + mariadblib \ +) + +endef +define gb_ExternalProject__use_mariadb +$(call gb_ExternalProject_use_static_libraries,$(1),mariadblib) + +endef + +endif # SYSTEM_MARIADB + + +ifeq ($(SYSTEM_MARIADB),YES) + define gb_LinkTarget__use_mysql $(call gb_LinkTarget_add_defs,$(1),\ |