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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
ca420edc
Commit
ca420edc
authored
Jul 06, 2005
by
kent@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
parents
c45f86a2
a7be4216
Changes
23
Show whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
48 additions
and
28 deletions
+48
-28
client/Makefile.am
client/Makefile.am
+2
-2
cmd-line-utils/libedit/Makefile.am
cmd-line-utils/libedit/Makefile.am
+2
-1
cmd-line-utils/readline/Makefile.am
cmd-line-utils/readline/Makefile.am
+2
-1
dbug/Makefile.am
dbug/Makefile.am
+2
-1
extra/Makefile.am
extra/Makefile.am
+2
-1
heap/Makefile.am
heap/Makefile.am
+2
-1
isam/Makefile.am
isam/Makefile.am
+2
-1
libmysql/Makefile.am
libmysql/Makefile.am
+2
-1
libmysql_r/Makefile.am
libmysql_r/Makefile.am
+3
-2
libmysqld/Makefile.am
libmysqld/Makefile.am
+2
-1
libmysqld/examples/Makefile.am
libmysqld/examples/Makefile.am
+2
-1
merge/Makefile.am
merge/Makefile.am
+2
-1
myisam/Makefile.am
myisam/Makefile.am
+2
-1
myisammrg/Makefile.am
myisammrg/Makefile.am
+2
-1
mysql-test/Makefile.am
mysql-test/Makefile.am
+1
-1
mysys/Makefile.am
mysys/Makefile.am
+2
-1
netware/Makefile.am
netware/Makefile.am
+1
-1
regex/Makefile.am
regex/Makefile.am
+2
-1
sql/Makefile.am
sql/Makefile.am
+2
-2
strings/Makefile.am
strings/Makefile.am
+2
-1
tests/Makefile.am
tests/Makefile.am
+2
-1
tools/Makefile.am
tools/Makefile.am
+5
-3
vio/Makefile.am
vio/Makefile.am
+2
-1
No files found.
client/Makefile.am
View file @
ca420edc
...
@@ -17,8 +17,8 @@
...
@@ -17,8 +17,8 @@
# This file is public domain and comes with NO WARRANTY of any kind
# This file is public domain and comes with NO WARRANTY of any kind
#AUTOMAKE_OPTIONS = nostdinc
#AUTOMAKE_OPTIONS = nostdinc
INCLUDES
=
-I
$(top_
srcdir)
/include
-I
$(top_srcdir)
/regex
\
INCLUDES
=
-I
$(top_
builddir)
/include
-I
$(top_srcdir)
/include
\
$(openssl_includes)
-I
$(top_srcdir)
/regex
$(openssl_includes)
LIBS
=
@CLIENT_LIBS@
LIBS
=
@CLIENT_LIBS@
LDADD
=
@CLIENT_EXTRA_LDFLAGS@
\
LDADD
=
@CLIENT_EXTRA_LDFLAGS@
\
$(top_builddir)
/libmysql/libmysqlclient.la
$(top_builddir)
/libmysql/libmysqlclient.la
...
...
cmd-line-utils/libedit/Makefile.am
View file @
ca420edc
...
@@ -5,7 +5,8 @@
...
@@ -5,7 +5,8 @@
ASRC
=
vi.c emacs.c common.c
ASRC
=
vi.c emacs.c common.c
AHDR
=
vi.h emacs.h common.h
AHDR
=
vi.h emacs.h common.h
INCLUDES
=
-I
$(top_srcdir)
/include
-I
$(srcdir)
/../..
-I
..
INCLUDES
=
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
\
-I
$(srcdir)
/../..
-I
..
noinst_LIBRARIES
=
libedit.a
noinst_LIBRARIES
=
libedit.a
...
...
cmd-line-utils/readline/Makefile.am
View file @
ca420edc
...
@@ -3,7 +3,8 @@
...
@@ -3,7 +3,8 @@
# Copyright (C) 1994,1996,1997 Free Software Foundation, Inc.
# Copyright (C) 1994,1996,1997 Free Software Foundation, Inc.
# Last -I$(top_srcdir) needed for RedHat!
# Last -I$(top_srcdir) needed for RedHat!
INCLUDES
=
-I
$(top_srcdir)
/include
-I
$(top_srcdir)
INCLUDES
=
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
\
-I
$(top_srcdir)
noinst_LIBRARIES
=
libreadline.a
noinst_LIBRARIES
=
libreadline.a
...
...
dbug/Makefile.am
View file @
ca420edc
...
@@ -15,7 +15,8 @@
...
@@ -15,7 +15,8 @@
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
# MA 02111-1307, USA
# MA 02111-1307, USA
INCLUDES
=
@MT_INCLUDES@
-I
$(top_srcdir)
/include
INCLUDES
=
@MT_INCLUDES@
\
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
LDADD
=
libdbug.a ../strings/libmystrings.a
LDADD
=
libdbug.a ../strings/libmystrings.a
pkglib_LIBRARIES
=
libdbug.a
pkglib_LIBRARIES
=
libdbug.a
noinst_HEADERS
=
dbug_long.h
noinst_HEADERS
=
dbug_long.h
...
...
extra/Makefile.am
View file @
ca420edc
...
@@ -14,7 +14,8 @@
...
@@ -14,7 +14,8 @@
# along with this program; if not, write to the Free Software
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
INCLUDES
=
@MT_INCLUDES@
-I
$(top_srcdir)
/include
\
INCLUDES
=
@MT_INCLUDES@
\
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
\
@ndbcluster_includes@
-I
$(top_srcdir)
/sql
@ndbcluster_includes@
-I
$(top_srcdir)
/sql
LDADD
=
@CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a
\
LDADD
=
@CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a
\
../dbug/libdbug.a ../strings/libmystrings.a
../dbug/libdbug.a ../strings/libmystrings.a
...
...
heap/Makefile.am
View file @
ca420edc
...
@@ -14,7 +14,8 @@
...
@@ -14,7 +14,8 @@
# along with this program; if not, write to the Free Software
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
INCLUDES
=
@MT_INCLUDES@
-I
$(top_srcdir)
/include
INCLUDES
=
@MT_INCLUDES@
\
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
LDADD
=
libheap.a ../mysys/libmysys.a ../dbug/libdbug.a
\
LDADD
=
libheap.a ../mysys/libmysys.a ../dbug/libdbug.a
\
../strings/libmystrings.a
../strings/libmystrings.a
pkglib_LIBRARIES
=
libheap.a
pkglib_LIBRARIES
=
libheap.a
...
...
isam/Makefile.am
View file @
ca420edc
...
@@ -14,7 +14,8 @@
...
@@ -14,7 +14,8 @@
# along with this program; if not, write to the Free Software
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
INCLUDES
=
@MT_INCLUDES@
-I
$(top_srcdir)
/include
INCLUDES
=
@MT_INCLUDES@
\
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
LDADD
=
@CLIENT_EXTRA_LDFLAGS@ libnisam.a ../mysys/libmysys.a
\
LDADD
=
@CLIENT_EXTRA_LDFLAGS@ libnisam.a ../mysys/libmysys.a
\
../dbug/libdbug.a ../strings/libmystrings.a
../dbug/libdbug.a ../strings/libmystrings.a
pkglib_LIBRARIES
=
libnisam.a
pkglib_LIBRARIES
=
libnisam.a
...
...
libmysql/Makefile.am
View file @
ca420edc
...
@@ -23,7 +23,8 @@
...
@@ -23,7 +23,8 @@
target
=
libmysqlclient.la
target
=
libmysqlclient.la
target_defs
=
-DUNDEF_THREADS_HACK
-DDONT_USE_RAID
@LIB_EXTRA_CCFLAGS@
target_defs
=
-DUNDEF_THREADS_HACK
-DDONT_USE_RAID
@LIB_EXTRA_CCFLAGS@
LIBS
=
@CLIENT_LIBS@
LIBS
=
@CLIENT_LIBS@
INCLUDES
=
-I
$(top_srcdir)
/include
$(openssl_includes)
@ZLIB_INCLUDES@
INCLUDES
=
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
\
$(openssl_includes)
@ZLIB_INCLUDES@
include
$(srcdir)/Makefile.shared
include
$(srcdir)/Makefile.shared
...
...
libmysql_r/Makefile.am
View file @
ca420edc
...
@@ -25,7 +25,8 @@ target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@
...
@@ -25,7 +25,8 @@ target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@
LIBS
=
@LIBS@ @ZLIB_LIBS@ @openssl_libs@
LIBS
=
@LIBS@ @ZLIB_LIBS@ @openssl_libs@
INCLUDES
=
@MT_INCLUDES@
\
INCLUDES
=
@MT_INCLUDES@
\
-I
$(top_srcdir)
/include
$(openssl_includes)
@ZLIB_INCLUDES@
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
\
$(openssl_includes)
@ZLIB_INCLUDES@
## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include
## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include
include
$(top_srcdir)/libmysql/Makefile.shared
include
$(top_srcdir)/libmysql/Makefile.shared
...
...
libmysqld/Makefile.am
View file @
ca420edc
...
@@ -25,7 +25,8 @@ DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \
...
@@ -25,7 +25,8 @@ DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \
-DDEFAULT_MYSQL_HOME
=
"
\"
$(MYSQLBASEdir)
\"
"
\
-DDEFAULT_MYSQL_HOME
=
"
\"
$(MYSQLBASEdir)
\"
"
\
-DDATADIR
=
"
\"
$(MYSQLDATAdir)
\"
"
\
-DDATADIR
=
"
\"
$(MYSQLDATAdir)
\"
"
\
-DSHAREDIR
=
"
\"
$(MYSQLSHAREdir)
\"
"
-DSHAREDIR
=
"
\"
$(MYSQLSHAREdir)
\"
"
INCLUDES
=
@MT_INCLUDES@ @bdb_includes@
-I
$(top_srcdir)
/include
\
INCLUDES
=
@MT_INCLUDES@ @bdb_includes@
\
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
\
-I
$(top_srcdir)
/sql
-I
$(top_srcdir)
/sql/examples
-I
$(top_srcdir)
/regex
\
-I
$(top_srcdir)
/sql
-I
$(top_srcdir)
/sql/examples
-I
$(top_srcdir)
/regex
\
$(openssl_includes)
@ZLIB_INCLUDES@
$(openssl_includes)
@ZLIB_INCLUDES@
...
...
libmysqld/examples/Makefile.am
View file @
ca420edc
...
@@ -30,7 +30,8 @@ link_sources:
...
@@ -30,7 +30,8 @@ link_sources:
done
;
done
;
DEFS
=
-DEMBEDDED_LIBRARY
DEFS
=
-DEMBEDDED_LIBRARY
INCLUDES
=
@MT_INCLUDES@
-I
$(top_srcdir)
/include
-I
$(srcdir)
\
INCLUDES
=
@MT_INCLUDES@
\
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
-I
$(srcdir)
\
-I
$(top_srcdir)
-I
$(top_srcdir)
/client
-I
$(top_srcdir)
/regex
\
-I
$(top_srcdir)
-I
$(top_srcdir)
/client
-I
$(top_srcdir)
/regex
\
$(openssl_includes)
$(openssl_includes)
LIBS
=
@LIBS@ @WRAPLIBS@ @CLIENT_LIBS@
LIBS
=
@LIBS@ @WRAPLIBS@ @CLIENT_LIBS@
...
...
merge/Makefile.am
View file @
ca420edc
...
@@ -14,7 +14,8 @@
...
@@ -14,7 +14,8 @@
# along with this program; if not, write to the Free Software
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
INCLUDES
=
@MT_INCLUDES@
-I
$(top_srcdir)
/include
INCLUDES
=
@MT_INCLUDES@
\
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
pkglib_LIBRARIES
=
libmerge.a
pkglib_LIBRARIES
=
libmerge.a
noinst_HEADERS
=
mrg_def.h
noinst_HEADERS
=
mrg_def.h
libmerge_a_SOURCES
=
mrg_open.c mrg_extra.c mrg_info.c mrg_locking.c
\
libmerge_a_SOURCES
=
mrg_open.c mrg_extra.c mrg_info.c mrg_locking.c
\
...
...
myisam/Makefile.am
View file @
ca420edc
...
@@ -17,7 +17,8 @@
...
@@ -17,7 +17,8 @@
EXTRA_DIST
=
mi_test_all.sh mi_test_all.res
EXTRA_DIST
=
mi_test_all.sh mi_test_all.res
pkgdata_DATA
=
mi_test_all mi_test_all.res
pkgdata_DATA
=
mi_test_all mi_test_all.res
INCLUDES
=
@MT_INCLUDES@
-I
$(top_srcdir)
/include
INCLUDES
=
@MT_INCLUDES@
\
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
LDADD
=
@CLIENT_EXTRA_LDFLAGS@ libmyisam.a
\
LDADD
=
@CLIENT_EXTRA_LDFLAGS@ libmyisam.a
\
$(top_builddir)
/mysys/libmysys.a
\
$(top_builddir)
/mysys/libmysys.a
\
$(top_builddir)
/dbug/libdbug.a
\
$(top_builddir)
/dbug/libdbug.a
\
...
...
myisammrg/Makefile.am
View file @
ca420edc
...
@@ -14,7 +14,8 @@
...
@@ -14,7 +14,8 @@
# along with this program; if not, write to the Free Software
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
INCLUDES
=
@MT_INCLUDES@
-I
$(top_srcdir)
/include
INCLUDES
=
@MT_INCLUDES@
\
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
pkglib_LIBRARIES
=
libmyisammrg.a
pkglib_LIBRARIES
=
libmyisammrg.a
noinst_HEADERS
=
myrg_def.h
noinst_HEADERS
=
myrg_def.h
libmyisammrg_a_SOURCES
=
myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c
\
libmyisammrg_a_SOURCES
=
myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c
\
...
...
mysql-test/Makefile.am
View file @
ca420edc
...
@@ -39,7 +39,7 @@ test_DATA = std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem
...
@@ -39,7 +39,7 @@ test_DATA = std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem
std_data/server-cert.pem std_data/server-key.pem
std_data/server-cert.pem std_data/server-key.pem
CLEANFILES
=
$(test_SCRIPTS)
$(test_DATA)
CLEANFILES
=
$(test_SCRIPTS)
$(test_DATA)
INCLUDES
=
-I
$(
srcdir)
/../include
-I
..
/include
-I
..
INCLUDES
=
-I
$(
top_builddir)
/include
-I
$(top_srcdir)
/include
-I
..
EXTRA_PROGRAMS
=
mysql_test_run_new
EXTRA_PROGRAMS
=
mysql_test_run_new
noinst_HEADERS
=
my_manage.h
noinst_HEADERS
=
my_manage.h
mysql_test_run_new_SOURCES
=
mysql_test_run_new.c my_manage.c my_create_tables.c
mysql_test_run_new_SOURCES
=
mysql_test_run_new.c my_manage.c my_create_tables.c
...
...
mysys/Makefile.am
View file @
ca420edc
...
@@ -18,7 +18,8 @@ MYSQLDATAdir = $(localstatedir)
...
@@ -18,7 +18,8 @@ MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir
=
$(pkgdatadir)
MYSQLSHAREdir
=
$(pkgdatadir)
MYSQLBASEdir
=
$(prefix)
MYSQLBASEdir
=
$(prefix)
INCLUDES
=
@MT_INCLUDES@
\
INCLUDES
=
@MT_INCLUDES@
\
@ZLIB_INCLUDES@
-I
$(top_srcdir)
/include
-I
$(srcdir)
@ZLIB_INCLUDES@
-I
$(top_builddir)
/include
\
-I
$(top_srcdir)
/include
-I
$(srcdir)
pkglib_LIBRARIES
=
libmysys.a
pkglib_LIBRARIES
=
libmysys.a
LDADD
=
libmysys.a ../dbug/libdbug.a
\
LDADD
=
libmysys.a ../dbug/libdbug.a
\
../strings/libmystrings.a
../strings/libmystrings.a
...
...
netware/Makefile.am
View file @
ca420edc
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
if
HAVE_NETWARE
if
HAVE_NETWARE
INCLUDES
=
-I
$(
srcdir)
/../include
-I
..
/include
-I
..
INCLUDES
=
-I
$(
top_builddir)
/include
-I
$(top_srcdir)
/include
-I
..
LDADD
=
@CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a
\
LDADD
=
@CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a
\
../dbug/libdbug.a ../strings/libmystrings.a
../dbug/libdbug.a ../strings/libmystrings.a
bin_PROGRAMS
=
mysqld_safe mysql_install_db mysql_test_run libmysql
bin_PROGRAMS
=
mysqld_safe mysql_install_db mysql_test_run libmysql
...
...
regex/Makefile.am
View file @
ca420edc
...
@@ -15,7 +15,8 @@
...
@@ -15,7 +15,8 @@
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
# MA 02111-1307, USA
# MA 02111-1307, USA
INCLUDES
=
@MT_INCLUDES@
-I
$(top_srcdir)
/include
INCLUDES
=
@MT_INCLUDES@
\
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
noinst_LIBRARIES
=
libregex.a
noinst_LIBRARIES
=
libregex.a
LDADD
=
libregex.a
$(top_builddir)
/strings/libmystrings.a
LDADD
=
libregex.a
$(top_builddir)
/strings/libmystrings.a
noinst_HEADERS
=
cclass.h cname.h regex2.h utils.h engine.c regex.h
noinst_HEADERS
=
cclass.h cname.h regex2.h utils.h engine.c regex.h
...
...
sql/Makefile.am
View file @
ca420edc
...
@@ -21,8 +21,8 @@ MYSQLSHAREdir = $(pkgdatadir)
...
@@ -21,8 +21,8 @@ MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir
=
$(prefix)
MYSQLBASEdir
=
$(prefix)
INCLUDES
=
@MT_INCLUDES@ @ZLIB_INCLUDES@
\
INCLUDES
=
@MT_INCLUDES@ @ZLIB_INCLUDES@
\
@bdb_includes@ @innodb_includes@ @ndbcluster_includes@
\
@bdb_includes@ @innodb_includes@ @ndbcluster_includes@
\
-I
$(top_
srcdir)
/include
-I
$(top_srcdir)
/regex
\
-I
$(top_
builddir)
/include
-I
$(top_srcdir)
/include
\
-I
$(srcdir)
$(openssl_includes)
-I
$(
top_srcdir)
/regex
-I
$(
srcdir)
$(openssl_includes)
WRAPLIBS
=
@WRAPLIBS@
WRAPLIBS
=
@WRAPLIBS@
SUBDIRS
=
share
SUBDIRS
=
share
libexec_PROGRAMS
=
mysqld
libexec_PROGRAMS
=
mysqld
...
...
strings/Makefile.am
View file @
ca420edc
...
@@ -16,7 +16,8 @@
...
@@ -16,7 +16,8 @@
# This file is public domain and comes with NO WARRANTY of any kind
# This file is public domain and comes with NO WARRANTY of any kind
INCLUDES
=
@MT_INCLUDES@
-I
$(top_srcdir)
/include
INCLUDES
=
@MT_INCLUDES@
\
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
pkglib_LIBRARIES
=
libmystrings.a
pkglib_LIBRARIES
=
libmystrings.a
# Exact one of ASSEMBLER_X
# Exact one of ASSEMBLER_X
...
...
tests/Makefile.am
View file @
ca420edc
...
@@ -32,7 +32,8 @@ noinst_PROGRAMS = insert_test select_test thread_test
...
@@ -32,7 +32,8 @@ noinst_PROGRAMS = insert_test select_test thread_test
#
#
# C Test for 4.1 protocol
# C Test for 4.1 protocol
#
#
INCLUDES
=
-I
$(top_srcdir)
/include
$(openssl_includes)
INCLUDES
=
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
\
$(openssl_includes)
LIBS
=
@CLIENT_LIBS@
LIBS
=
@CLIENT_LIBS@
LDADD
=
@CLIENT_EXTRA_LDFLAGS@ ../libmysql/libmysqlclient.la
LDADD
=
@CLIENT_EXTRA_LDFLAGS@ ../libmysql/libmysqlclient.la
mysql_client_test_LDADD
=
$(LDADD)
$(CXXLDFLAGS)
mysql_client_test_LDADD
=
$(LDADD)
$(CXXLDFLAGS)
...
...
tools/Makefile.am
View file @
ca420edc
...
@@ -15,9 +15,11 @@
...
@@ -15,9 +15,11 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# Process this file with automake to create Makefile.in
# Process this file with automake to create Makefile.in
INCLUDES
=
@MT_INCLUDES@
-I
$(top_srcdir)
/include
$(openssl_includes)
INCLUDES
=
@MT_INCLUDES@
-I
$(top_builddir)
/include
\
-I
$(top_srcdir)
/include
$(openssl_includes)
LDADD
=
@CLIENT_EXTRA_LDFLAGS@ @openssl_libs@
\
LDADD
=
@CLIENT_EXTRA_LDFLAGS@ @openssl_libs@
\
$(top_builddir)
/libmysql_r/libmysqlclient_r.la @ZLIB_LIBS@
$(top_builddir)
/libmysql_r/libmysqlclient_r.la
\
@ZLIB_LIBS@
bin_PROGRAMS
=
mysqlmanager
bin_PROGRAMS
=
mysqlmanager
mysqlmanager_SOURCES
=
mysqlmanager.c
mysqlmanager_SOURCES
=
mysqlmanager.c
mysqlmanager_DEPENDENCIES
=
$(LIBRARIES)
$(pkglib_LTLIBRARIES)
mysqlmanager_DEPENDENCIES
=
$(LIBRARIES)
$(pkglib_LTLIBRARIES)
...
...
vio/Makefile.am
View file @
ca420edc
...
@@ -14,7 +14,8 @@
...
@@ -14,7 +14,8 @@
# along with this program; if not, write to the Free Software
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
INCLUDES
=
-I
$(top_srcdir)
/include
$(openssl_includes)
INCLUDES
=
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
\
$(openssl_includes)
LDADD
=
@CLIENT_EXTRA_LDFLAGS@
$(openssl_libs)
LDADD
=
@CLIENT_EXTRA_LDFLAGS@
$(openssl_libs)
pkglib_LIBRARIES
=
libvio.a
pkglib_LIBRARIES
=
libvio.a
noinst_PROGRAMS
=
test-ssl test-sslserver test-sslclient
noinst_PROGRAMS
=
test-ssl test-sslserver test-sslclient
...
...
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