Commit a74939e2 authored by unknown's avatar unknown
Browse files

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
parent 7865ce61

server-tools/instance-manager/Makefile.am

+6 −5
Original line number Diff line number Diff line
@@ -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 \