diff options
| author | unknown <kent@mysql.com> | 2006-03-03 02:46:47 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-03-03 02:46:47 +0100 |
| commit | a74939e2401a2af905292ecacbcae31997509123 (patch) | |
| tree | df8ed6180db1bccdc6bdcbdab2e99d6a6bf2aadb /server-tools | |
| parent | 7865ce6188cd45dfc9b5d074912a78ce6683a55e (diff) | |
| download | mariadb-git-a74939e2401a2af905292ecacbcae31997509123.tar.gz | |
Makefile.am:
Use libtool convenience lib, to access get_password object correctly, bug#17155
server-tools/instance-manager/Makefile.am:
Use libtool convenience lib, to access get_password object correctly, bug#17155
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/Makefile.am | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am index 5b9690322aa..218eceebd12 100644 --- a/server-tools/instance-manager/Makefile.am +++ b/server-tools/instance-manager/Makefile.am @@ -24,9 +24,10 @@ DEFS= -DMYSQL_INSTANCE_MANAGER -DMYSQL_SERVER # default_options.h, generated from default_options.h.in) # See automake/autoconf docs for details -noinst_LIBRARIES= liboptions.a libnet.a +noinst_LTLIBRARIES= liboptions.la +noinst_LIBRARIES= libnet.a -liboptions_a_CXXFLAGS= $(CXXFLAGS) \ +liboptions_la_CXXFLAGS= $(CXXFLAGS) \ -DDEFAULT_PID_FILE_NAME="$(localstatedir)/mysqlmanager.pid" \ -DDEFAULT_LOG_FILE_NAME="$(localstatedir)/mysqlmanager.log" \ -DDEFAULT_SOCKET_FILE_NAME="/tmp/mysqlmanager.sock" \ @@ -35,8 +36,8 @@ liboptions_a_CXXFLAGS= $(CXXFLAGS) \ -DDEFAULT_CONFIG_FILE="/etc/my.cnf" \ -DPROTOCOL_VERSION=@PROTOCOL_VERSION@ -liboptions_a_SOURCES= options.h options.cc priv.h priv.cc -liboptions_a_LIBADD= $(top_builddir)/libmysql/get_password.$(OBJEXT) +liboptions_la_SOURCES= options.h options.cc priv.h priv.cc +liboptions_la_LIBADD= $(top_builddir)/libmysql/get_password.lo # MySQL sometimes uses symlinks to reuse code # All symlinked files are grouped in libnet.a @@ -77,7 +78,7 @@ mysqlmanager_SOURCES= command.cc command.h mysqlmanager.cc \ mysql_manager_error.h \ portability.h -mysqlmanager_LDADD= liboptions.a \ +mysqlmanager_LDADD= liboptions.la \ libnet.a \ $(top_builddir)/vio/libvio.a \ $(top_builddir)/mysys/libmysys.a \ |