diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-01-28 23:53:30 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-01-28 23:57:28 +0100 |
| commit | 5f356bd99726818dc44b316be3327dad057f7cbe (patch) | |
| tree | 1f94463781231d12a0d41e5d5981e32cd0084d87 /mysqlc/Extension_mysql-connector-ooo.mk | |
| parent | b02d799732594eee67cab0f86dc3b09182f628a5 (diff) | |
mysqlc: tweak gbuild conversion:
- the mysqlc library did link against the mysqlcppconn only when a
SYSTEM_MYSQL_CPPCONN is used
- mysqlc is an EXTENSIONLIB, mysqlcppconn is PLAINLIBS_NONE
- one N was missing in Extension makefile, and use
gb_Extension_add_library to put in mysqlcppconn
- manifest.xml, description.xml: update PLACEHOLDERS
Change-Id: If45714f81056a6c1a4cb3380b50cc3dcc0443bb8
Diffstat (limited to 'mysqlc/Extension_mysql-connector-ooo.mk')
| -rw-r--r-- | mysqlc/Extension_mysql-connector-ooo.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mysqlc/Extension_mysql-connector-ooo.mk b/mysqlc/Extension_mysql-connector-ooo.mk index 65f2b0d5cd97..23e769f97f64 100644 --- a/mysqlc/Extension_mysql-connector-ooo.mk +++ b/mysqlc/Extension_mysql-connector-ooo.mk @@ -17,10 +17,8 @@ $(eval $(call gb_Extension_add_files,mysql-connector-ooo,images,\ $(SRCDIR)/icon-themes/galaxy/desktop/res/extension_32.png \ )) -ifeq ($(SYSTEM_MYSQL_CPPCON),NO) -$(eval $(call gb_Extension_add_files,mysql-connector-ooo,,\ - $(call gb_Library_get_target,mysqlcppcon) \ -)) +ifeq ($(SYSTEM_MYSQL_CPPCONN),NO) +$(eval $(call gb_Extension_add_library,mysql-connector-ooo,mysqlcppconn)) endif # HACK: comes from Library_mysql.mk |