move mariadb to libs section

Change-Id: Ie78ea961a32e96c90bb674766b24a0c44d27412c

move mariadb to libs section
Change-Id: Ie78ea961a32e96c90bb674766b24a0c44d27412c
217eae4f · David Tardon · 80b41915 · 217eae4f
Kaydet (Commit) 217eae4f authored Kas 05, 2013 tarafından David Tardon
Hide whitespace changes
Inline Side-by-side

Showing with 32 additions and 32 deletions

RepositoryExternal.mk RepositoryExternal.mk +32 -32

No files found.
--- 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 :=
@@ -219,6 +187,38 @@ $(call gb_LinkTarget_add_libs,$(1),-liconv)

 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