Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
5557a442
Commit
5557a442
authored
Mar 03, 2006
by
kent@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Makefile.am:
Use libtool convenience lib, to access get_password object correctly, bug#17155
parent
d85e9295
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
server-tools/instance-manager/Makefile.am
server-tools/instance-manager/Makefile.am
+6
-5
No files found.
server-tools/instance-manager/Makefile.am
View file @
5557a442
...
@@ -24,9 +24,10 @@ DEFS= -DMYSQL_INSTANCE_MANAGER -DMYSQL_SERVER
...
@@ -24,9 +24,10 @@ DEFS= -DMYSQL_INSTANCE_MANAGER -DMYSQL_SERVER
# default_options.h, generated from default_options.h.in)
# default_options.h, generated from default_options.h.in)
# See automake/autoconf docs for details
# 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_
l
a_CXXFLAGS
=
$(CXXFLAGS)
\
-DDEFAULT_PID_FILE_NAME
=
"
$(localstatedir)
/mysqlmanager.pid"
\
-DDEFAULT_PID_FILE_NAME
=
"
$(localstatedir)
/mysqlmanager.pid"
\
-DDEFAULT_LOG_FILE_NAME
=
"
$(localstatedir)
/mysqlmanager.log"
\
-DDEFAULT_LOG_FILE_NAME
=
"
$(localstatedir)
/mysqlmanager.log"
\
-DDEFAULT_SOCKET_FILE_NAME
=
"/tmp/mysqlmanager.sock"
\
-DDEFAULT_SOCKET_FILE_NAME
=
"/tmp/mysqlmanager.sock"
\
...
@@ -35,8 +36,8 @@ liboptions_a_CXXFLAGS= $(CXXFLAGS) \
...
@@ -35,8 +36,8 @@ liboptions_a_CXXFLAGS= $(CXXFLAGS) \
-DDEFAULT_CONFIG_FILE
=
"/etc/my.cnf"
\
-DDEFAULT_CONFIG_FILE
=
"/etc/my.cnf"
\
-DPROTOCOL_VERSION
=
@PROTOCOL_VERSION@
-DPROTOCOL_VERSION
=
@PROTOCOL_VERSION@
liboptions_a_SOURCES
=
options.h options.cc priv.h priv.cc
liboptions_
l
a_SOURCES
=
options.h options.cc priv.h priv.cc
liboptions_
a_LIBADD
=
$(top_builddir)
/libmysql/get_password.
$(OBJEXT)
liboptions_
la_LIBADD
=
$(top_builddir)
/libmysql/get_password.lo
# MySQL sometimes uses symlinks to reuse code
# MySQL sometimes uses symlinks to reuse code
# All symlinked files are grouped in libnet.a
# All symlinked files are grouped in libnet.a
...
@@ -77,7 +78,7 @@ mysqlmanager_SOURCES= command.cc command.h mysqlmanager.cc \
...
@@ -77,7 +78,7 @@ mysqlmanager_SOURCES= command.cc command.h mysqlmanager.cc \
mysql_manager_error.h
\
mysql_manager_error.h
\
portability.h
portability.h
mysqlmanager_LDADD
=
liboptions.a
\
mysqlmanager_LDADD
=
liboptions.
l
a
\
libnet.a
\
libnet.a
\
$(top_builddir)
/vio/libvio.a
\
$(top_builddir)
/vio/libvio.a
\
$(top_builddir)
/mysys/libmysys.a
\
$(top_builddir)
/mysys/libmysys.a
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment