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
ee0b6db1
Commit
ee0b6db1
authored
Nov 04, 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
b8248334
095efe48
Changes
19
Show whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
111 additions
and
101 deletions
+111
-101
Docs/Makefile.am
Docs/Makefile.am
+14
-10
Makefile.am
Makefile.am
+15
-16
client/Makefile.am
client/Makefile.am
+2
-2
cmd-line-utils/libedit/Makefile.am
cmd-line-utils/libedit/Makefile.am
+8
-8
configure.in
configure.in
+8
-3
include/Makefile.am
include/Makefile.am
+4
-12
libmysql/Makefile.am
libmysql/Makefile.am
+16
-16
libmysql_r/Makefile.am
libmysql_r/Makefile.am
+2
-2
libmysqld/Makefile.am
libmysqld/Makefile.am
+8
-8
libmysqld/examples/Makefile.am
libmysqld/examples/Makefile.am
+8
-7
mysql-test/Makefile.am
mysql-test/Makefile.am
+3
-0
ndb/docs/Makefile.am
ndb/docs/Makefile.am
+1
-3
netware/Makefile.am
netware/Makefile.am
+3
-3
pstack/Makefile.am
pstack/Makefile.am
+1
-1
scripts/Makefile.am
scripts/Makefile.am
+3
-2
sql-bench/Makefile.am
sql-bench/Makefile.am
+2
-0
sql/Makefile.am
sql/Makefile.am
+6
-6
sql/share/Makefile.am
sql/share/Makefile.am
+7
-0
support-files/Makefile.am
support-files/Makefile.am
+0
-2
No files found.
Docs/Makefile.am
View file @
ee0b6db1
...
@@ -18,11 +18,11 @@ noinst_SCRIPTS = Support/generate-text-files.pl
...
@@ -18,11 +18,11 @@ noinst_SCRIPTS = Support/generate-text-files.pl
EXTRA_DIST
=
$(noinst_SCRIPTS)
mysql.info INSTALL-BINARY
EXTRA_DIST
=
$(noinst_SCRIPTS)
mysql.info INSTALL-BINARY
all
:
txt_files
TXT_FILES
=
../INSTALL-SOURCE ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT
\
txt_files
:
../INSTALL-SOURCE ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT
\
INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
all-local
:
$(TXT_FILES)
# make sure that "make install" installs the info page, too
# make sure that "make install" installs the info page, too
# automake only seems to take care of this automatically,
# automake only seems to take care of this automatically,
# if we're building the info page from texi directly.
# if we're building the info page from texi directly.
...
@@ -30,28 +30,32 @@ install-data-hook: mysql.info
...
@@ -30,28 +30,32 @@ install-data-hook: mysql.info
$(mkinstalldirs)
$(DESTDIR)$(infodir)
$(mkinstalldirs)
$(DESTDIR)$(infodir)
$(INSTALL_DATA)
$(srcdir)
/mysql.info
$(DESTDIR)$(infodir)
$(INSTALL_DATA)
$(srcdir)
/mysql.info
$(DESTDIR)$(infodir)
CLEAN_FILES
:
$(txt_files)
uninstall-local
:
touch
$(txt_files)
@
RM@
-f
$(DESTDIR)$(infodir)
/mysql.info
# This target is not used in builds, just for convinience
CLEAN_FILES
:
$(TXT_FILES)
touch
$(TXT_FILES)
GT
=
$(srcdir)
/Support/generate-text-files.pl
GT
=
$(srcdir)
/Support/generate-text-files.pl
../INSTALL-SOURCE
:
mysql.info $(GT)
../INSTALL-SOURCE
:
mysql.info $(GT)
perl
-w
$(GT)
mysql.info
"installing-source"
"windows-source-build"
>
$@
perl
-w
$(GT)
$<
"installing-source"
"windows-source-build"
>
$@
../INSTALL-WIN-SOURCE
:
mysql.info $(GT)
../INSTALL-WIN-SOURCE
:
mysql.info $(GT)
perl
-w
$(GT)
mysql.info
"windows-source-build"
"post-installation"
>
$@
perl
-w
$(GT)
$<
"windows-source-build"
"post-installation"
>
$@
# We put the description for the binary installation here so that
# We put the description for the binary installation here so that
# people who download source wont have to see it. It is moved up to
# people who download source wont have to see it. It is moved up to
# the toplevel by the script that makes the binary tar files.
# the toplevel by the script that makes the binary tar files.
INSTALL-BINARY
:
mysql.info $(GT)
INSTALL-BINARY
:
mysql.info $(GT)
perl
-w
$(GT)
mysql.info
"installing-binary"
"installing-source"
>
$@
perl
-w
$(GT)
$<
"installing-binary"
"installing-source"
>
$@
../EXCEPTIONS-CLIENT
:
mysql.info $(GT)
../EXCEPTIONS-CLIENT
:
mysql.info $(GT)
perl
-w
$(GT)
mysql.info
"mysql-floss-license-exception"
"function-index"
>
$@
perl
-w
$(GT)
$<
"mysql-floss-license-exception"
"function-index"
>
$@
../support-files/MacOSX/ReadMe.txt
:
mysql.info $(GT)
../support-files/MacOSX/ReadMe.txt
:
mysql.info $(GT)
perl
-w
$(GT)
mysql.info
"mac-os-x-installation"
"netware-installation"
>
$@
perl
-w
$(GT)
$<
"mac-os-x-installation"
"netware-installation"
>
$@
# Don't update the files from bitkeeper
# Don't update the files from bitkeeper
%
::
SCCS/s.%
%
::
SCCS/s.%
Makefile.am
View file @
ee0b6db1
...
@@ -19,7 +19,8 @@
...
@@ -19,7 +19,8 @@
AUTOMAKE_OPTIONS
=
foreign
AUTOMAKE_OPTIONS
=
foreign
# These are built from source in the Docs directory
# These are built from source in the Docs directory
EXTRA_DIST
=
INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
EXTRA_DIST
=
INSTALL-SOURCE INSTALL-WIN-SOURCE
\
README COPYING EXCEPTIONS-CLIENT
SUBDIRS
=
.
include @docs_dirs@ @zlib_dir@
\
SUBDIRS
=
.
include @docs_dirs@ @zlib_dir@
\
@readline_topdir@ sql-common
\
@readline_topdir@ sql-common
\
@thread_dirs@ pstack
\
@thread_dirs@ pstack
\
...
@@ -34,16 +35,19 @@ DIST_SUBDIRS = . include @docs_dirs@ zlib \
...
@@ -34,16 +35,19 @@ DIST_SUBDIRS = . include @docs_dirs@ zlib \
BUILD netware os2 @libmysqld_dirs@
\
BUILD netware os2 @libmysqld_dirs@
\
@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
# Relink after clean
# Run these targets before any others, also make part of clean target,
linked_sources
=
linked_client_sources linked_server_sources
\
# to make sure we create new links after a clean.
linked_libmysql_sources linked_libmysql_r_sources
\
BUILT_SOURCES
=
linked_client_sources linked_server_sources
\
linked_libmysqld_sources linked_libmysqldex_sources
\
@linked_client_targets@
\
@linked_libmysqld_targets@
\
linked_include_sources @linked_netware_sources@
linked_include_sources @linked_netware_sources@
CLEANFILES
=
$(linked_sources)
# The db.h file is a bit special, see note in "configure.in".
# In the case we didn't compile with bdb, a dummy file is put
# This is just so that the linking is done early.
# there, but will not be removed by the bdb make file becuase
all-local
:
$(linked_sources)
# it will never be called.
CLEANFILES
=
$(BUILT_SOURCES)
bdb/build_unix/db.h
DISTCLEANFILES
=
ac_available_languages_fragment
linked_include_sources
:
linked_include_sources
:
cd
include
;
$(MAKE)
link_sources
cd
include
;
$(MAKE)
link_sources
...
@@ -73,13 +77,8 @@ linked_netware_sources:
...
@@ -73,13 +77,8 @@ linked_netware_sources:
cd
@netware_dir@
;
$(MAKE)
link_sources
cd
@netware_dir@
;
$(MAKE)
link_sources
echo
timestamp
>
linked_netware_sources
echo
timestamp
>
linked_netware_sources
#avoid recursive make calls in sql directory
linked_server_sources
:
linked_server_sources
:
cd
sql
;
rm
-f
mini_client_errors.c
;
\
cd
sql
;
$(MAKE)
link_sources
@LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c
;
\
rm
-f
pack.c
;
@LN_CP_F@ ../sql-common/pack.c pack.c
;
\
rm
-f
client.c
;
@LN_CP_F@ ../sql-common/client.c client.c
;
\
rm
-f
my_time.c
;
@LN_CP_F@ ../sql-common/my_time.c my_time.c
echo
timestamp
>
linked_server_sources
echo
timestamp
>
linked_server_sources
# Create permission databases
# Create permission databases
...
@@ -91,7 +90,7 @@ bin-dist: all
...
@@ -91,7 +90,7 @@ bin-dist: all
# Remove BK's "SCCS" subdirectories from source distribution
# Remove BK's "SCCS" subdirectories from source distribution
dist-hook
:
dist-hook
:
rm
-rf
`
find
$(distdir)
-type
d
-name
SCCS
`
rm
-rf
`
find
$(distdir)
-type
d
-name
SCCS
-print
`
tags
:
tags
:
support-files/build-tags
support-files/build-tags
...
...
client/Makefile.am
View file @
ee0b6db1
...
@@ -41,8 +41,8 @@ DEFS = -DUNDEF_THREADS_HACK
...
@@ -41,8 +41,8 @@ DEFS = -DUNDEF_THREADS_HACK
link_sources
:
link_sources
:
for
f
in
$(sql_src)
;
do
\
for
f
in
$(sql_src)
;
do
\
rm
-f
$
(srcdir)
/
$
$
f
;
\
rm
-f
$$
f
;
\
@LN_CP_F@
$(top_srcdir)
/sql/
$$
f
$
(srcdir)
/
$
$
f
;
\
@LN_CP_F@
$(top_srcdir)
/sql/
$$
f
$$
f
;
\
done
;
done
;
# Don't update the files from bitkeeper
# Don't update the files from bitkeeper
...
...
cmd-line-utils/libedit/Makefile.am
View file @
ee0b6db1
...
@@ -2,8 +2,8 @@
...
@@ -2,8 +2,8 @@
# Makefile for the GNU readline library.
# Makefile for the GNU readline library.
# Copyright (C) 1994,1996,1997 Free Software Foundation, Inc.
# Copyright (C) 1994,1996,1997 Free Software Foundation, Inc.
ASRC
=
vi.c emacs.c
common.c
ASRC
=
$(srcdir)
/vi.c
$(srcdir)
/emacs.c
$(srcdir)
/
common.c
AHDR
=
vi.h emacs.h common.h
AHDR
=
vi.h emacs.h common.h
INCLUDES
=
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
\
INCLUDES
=
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
\
-I
$(srcdir)
/../..
-I
..
-I
$(srcdir)
/../..
-I
..
...
@@ -42,16 +42,16 @@ SUFFIXES = .sh
...
@@ -42,16 +42,16 @@ SUFFIXES = .sh
$<
>
$@
-t
$<
>
$@
-t
@
MV@
$@
-t
$@
@
MV@
$@
-t
$@
vi.h
:
vi.c makelist
vi.h
:
$(srcdir)/
vi.c makelist
sh ./makelist
-h
.
/vi.c
>
$@
.tmp
&&
\
sh ./makelist
-h
$(srcdir)
/vi.c
>
$@
.tmp
&&
\
mv
$@
.tmp
$@
mv
$@
.tmp
$@
emacs.h
:
emacs.c makelist
emacs.h
:
$(srcdir)/
emacs.c makelist
sh ./makelist
-h
.
/emacs.c
>
$@
.tmp
&&
\
sh ./makelist
-h
$(srcdir)
/emacs.c
>
$@
.tmp
&&
\
mv
$@
.tmp
$@
mv
$@
.tmp
$@
common.h
:
common.c makelist
common.h
:
$(srcdir)/
common.c makelist
sh ./makelist
-h
.
/common.c
>
$@
.tmp
&&
\
sh ./makelist
-h
$(srcdir)
/common.c
>
$@
.tmp
&&
\
mv
$@
.tmp
$@
mv
$@
.tmp
$@
help.c
:
${ASRC} makelist
help.c
:
${ASRC} makelist
...
...
configure.in
View file @
ee0b6db1
...
@@ -37,7 +37,7 @@ romanian russian serbian slovak spanish swedish ukrainian"
...
@@ -37,7 +37,7 @@ romanian russian serbian slovak spanish swedish ukrainian"
# Generate make rules for all error messages
# Generate make rules for all error messages
AVAILABLE_LANGUAGES_ERRORS
=
AVAILABLE_LANGUAGES_ERRORS
=
AVAILABLE_LANGUAGES_ERRORS_RULES
=
$srcdir
/
ac_available_languages_fragment
AVAILABLE_LANGUAGES_ERRORS_RULES
=
ac_available_languages_fragment
rm
-f
$AVAILABLE_LANGUAGES_ERRORS_RULES
rm
-f
$AVAILABLE_LANGUAGES_ERRORS_RULES
for
i
in
$AVAILABLE_LANGUAGES
for
i
in
$AVAILABLE_LANGUAGES
do
do
...
@@ -2300,6 +2300,7 @@ then
...
@@ -2300,6 +2300,7 @@ then
echo
"Warning: extra-tools disabled because --enable-thread-safe-client wasn't used"
echo
"Warning: extra-tools disabled because --enable-thread-safe-client wasn't used"
else
else
tools_dirs
=
"tools"
tools_dirs
=
"tools"
AC_CONFIG_FILES
(
tools/Makefile
)
fi
fi
fi
fi
AC_SUBST
(
tools_dirs
)
AC_SUBST
(
tools_dirs
)
...
@@ -2310,9 +2311,12 @@ MYSQL_CHECK_VIO
...
@@ -2310,9 +2311,12 @@ MYSQL_CHECK_VIO
MYSQL_CHECK_OPENSSL
MYSQL_CHECK_OPENSSL
libmysqld_dirs
=
libmysqld_dirs
=
linked_libmysqld_targets
=
if
test
"
$with_embedded_server
"
=
"yes"
if
test
"
$with_embedded_server
"
=
"yes"
then
then
libmysqld_dirs
=
libmysqld
libmysqld_dirs
=
libmysqld
linked_libmysqld_targets
=
"linked_libmysqld_sources linked_libmysqldex_sources"
AC_CONFIG_FILES
(
libmysqld/Makefile libmysqld/examples/Makefile
)
# We can't build embedded library without building the server, because
# We can't build embedded library without building the server, because
# we depend on libmysys, libmystrings, libmyisam, etc.
# we depend on libmysys, libmystrings, libmyisam, etc.
with_server
=
yes
with_server
=
yes
...
@@ -2321,6 +2325,7 @@ fi
...
@@ -2321,6 +2325,7 @@ fi
# mysql_config --libmysqld-libs will print out something like
# mysql_config --libmysqld-libs will print out something like
# -L/path/to/lib/mysql -lmysqld -lmyisam -lmysys -lmystrings -ldbug ...
# -L/path/to/lib/mysql -lmysqld -lmyisam -lmysys -lmystrings -ldbug ...
AC_SUBST
([
libmysqld_dirs]
)
AC_SUBST
([
libmysqld_dirs]
)
AC_SUBST
([
linked_libmysqld_targets]
)
# Shall we build the docs?
# Shall we build the docs?
AC_ARG_WITH
(
docs,
AC_ARG_WITH
(
docs,
...
@@ -2915,6 +2920,7 @@ if test "$THREAD_SAFE_CLIENT" != "no"
...
@@ -2915,6 +2920,7 @@ if test "$THREAD_SAFE_CLIENT" != "no"
then
then
sql_client_dirs
=
"libmysql_r
$sql_client_dirs
"
sql_client_dirs
=
"libmysql_r
$sql_client_dirs
"
linked_client_targets
=
"
$linked_client_targets
linked_libmysql_r_sources"
linked_client_targets
=
"
$linked_client_targets
linked_libmysql_r_sources"
AC_CONFIG_FILES
(
libmysql_r/Makefile
)
AC_DEFINE
([
THREAD_SAFE_CLIENT],
[
1],
[
Should be client be thread safe]
)
AC_DEFINE
([
THREAD_SAFE_CLIENT],
[
1],
[
Should be client be thread safe]
)
fi
fi
...
@@ -3269,12 +3275,11 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
...
@@ -3269,12 +3275,11 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
myisam/Makefile myisammrg/Makefile dnl
myisam/Makefile myisammrg/Makefile dnl
os2/Makefile os2/include/Makefile os2/include/sys/Makefile dnl
os2/Makefile os2/include/Makefile os2/include/sys/Makefile dnl
man/Makefile BUILD/Makefile vio/Makefile dnl
man/Makefile BUILD/Makefile vio/Makefile dnl
libmysql_r/Makefile libmysqld/Makefile libmysqld/examples/Makefile dnl
libmysql/Makefile client/Makefile dnl
libmysql/Makefile client/Makefile dnl
pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile dnl
pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile dnl
sql-common/Makefile SSL/Makefile dnl
sql-common/Makefile SSL/Makefile dnl
dbug/Makefile scripts/Makefile dnl
dbug/Makefile scripts/Makefile dnl
include/Makefile sql-bench/Makefile
tools/Makefile
dnl
include/Makefile sql-bench/Makefile dnl
tests/Makefile Docs/Makefile support-files/Makefile dnl
tests/Makefile Docs/Makefile support-files/Makefile dnl
support-files/MacOSX/Makefile mysql-test/Makefile dnl
support-files/MacOSX/Makefile mysql-test/Makefile dnl
netware/Makefile dnl
netware/Makefile dnl
...
...
include/Makefile.am
View file @
ee0b6db1
...
@@ -38,23 +38,15 @@ SUPERCLEANFILES = mysql_version.h my_config.h
...
@@ -38,23 +38,15 @@ SUPERCLEANFILES = mysql_version.h my_config.h
# Some include files that may be moved and patched by configure
# Some include files that may be moved and patched by configure
DISTCLEANFILES
=
sched.h
$(SUPERCLEANFILES)
DISTCLEANFILES
=
sched.h
$(SUPERCLEANFILES)
clean
:
clean
-local
:
$(RM)
-fr
readline
$(RM)
-fr
readline
distclean
:
distclean
-local
:
$(RM)
-fr
readline
$(RM)
-fr
readline
all-local
:
my_config.h
# Since we include my_config.h it better exist from the beginning
link_sources
:
$(CP)
../config.h my_config.h
-
$(RM)
-fr
readline
@
readline_h_ln_cmd@
# Keep automake happy
my_config.h
:
../config.h
my_config.h
:
../config.h
$(CP)
../config.h my_config.h
$(CP)
../config.h my_config.h
link_sources
:
-
$(RM)
-fr
readline
-
$(RM)
-fr
readline
@
readline_h_ln_cmd@
@
readline_h_ln_cmd@
...
...
libmysql/Makefile.am
View file @
ee0b6db1
...
@@ -43,33 +43,33 @@ link_sources:
...
@@ -43,33 +43,33 @@ link_sources:
vs
=
`
echo
$(vio_objects)
|
sed
"s;
\.
lo;.c;g"
`
;
\
vs
=
`
echo
$(vio_objects)
|
sed
"s;
\.
lo;.c;g"
`
;
\
scs
=
`
echo
$(sql_cmn_objects)
|
sed
"s;
\.
lo;.c;g"
`
;
\
scs
=
`
echo
$(sql_cmn_objects)
|
sed
"s;
\.
lo;.c;g"
`
;
\
for
f
in
$$
ss
;
do
\
for
f
in
$$
ss
;
do
\
rm
-f
$
(srcdir)
/
$
$
f
;
\
rm
-f
$$
f
;
\
@LN_CP_F@
$(
srcdir)
/../strings/
$$
f
$(srcdir)
/
$$
f
;
\
@LN_CP_F@
$(
top_srcdir)
/strings/
$$
f
$$
f
;
\
done
;
\
done
;
\
for
f
in
$$
vs
$(vioheaders)
;
do
\
for
f
in
$$
vs
$(vioheaders)
;
do
\
rm
-f
$
(srcdir)
/
$
$
f
;
\
rm
-f
$$
f
;
\
@LN_CP_F@
$(
srcdir)
/../vio/
$$
f
$(srcdir)
/
$$
f
;
\
@LN_CP_F@
$(
top_srcdir)
/vio/
$$
f
$$
f
;
\
done
;
\
done
;
\
for
f
in
$$
scs
;
do
\
for
f
in
$$
scs
;
do
\
rm
-f
$
(srcdir)
/
$
$
f
;
\
rm
-f
$$
f
;
\
@LN_CP_F@
$(
srcdir)
/../sql-common/
$$
f
$(srcdir)
/
$$
f
;
\
@LN_CP_F@
$(
top_srcdir)
/sql-common/
$$
f
$$
f
;
\
done
;
\
done
;
\
for
f
in
$(mystringsextra)
;
do
\
for
f
in
$(mystringsextra)
;
do
\
rm
-f
$
(srcdir)
/
$
$
f
;
\
rm
-f
$$
f
;
\
@LN_CP_F@
$(
srcdir)
/../strings/
$$
f
$(srcdir)
/
$$
f
;
\
@LN_CP_F@
$(
top_srcdir)
/strings/
$$
f
$$
f
;
\
done
;
\
done
;
\
for
f
in
$$
ds
;
do
\
for
f
in
$$
ds
;
do
\
rm
-f
$
(srcdir)
/
$
$
f
;
\
rm
-f
$$
f
;
\
@LN_CP_F@
$(
srcdir)
/../dbug/
$$
f
$(srcdir)
/
$$
f
;
\
@LN_CP_F@
$(
top_srcdir)
/dbug/
$$
f
$$
f
;
\
done
;
\
done
;
\
for
f
in
$$
ms
$(mysysheaders)
;
do
\
for
f
in
$$
ms
$(mysysheaders)
;
do
\
rm
-f
$
(srcdir)
/
$
$
f
;
\
rm
-f
$$
f
;
\
@LN_CP_F@
$(
srcdir)
/../mysys/
$$
f
$(srcdir)
/
$$
f
;
\
@LN_CP_F@
$(
top_srcdir)
/mysys/
$$
f
$$
f
;
\
done
;
\
done
;
\
rm
-f
$(srcdir)
/
net.c
;
\
rm
-f
net.c
;
\
@LN_CP_F@
$(
srcdir)
/../sql/net_serv.cc
$(srcdir)
/
net.c
;
\
@LN_CP_F@
$(
top_srcdir)
/sql/net_serv.cc
net.c
;
\
rm
-f
$(srcdir)
/
password.c
;
\
rm
-f
password.c
;
\
@LN_CP_F@
$(
srcdir)
/../sql/password.c
$(srcdir)
/
password.c
@LN_CP_F@
$(
top_srcdir)
/sql/password.c
password.c
# This part requires GNUmake
# This part requires GNUmake
#
#
...
...
libmysql_r/Makefile.am
View file @
ee0b6db1
...
@@ -41,6 +41,6 @@ libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
...
@@ -41,6 +41,6 @@ libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
link_sources
:
link_sources
:
set
-x
;
\
set
-x
;
\
for
f
in
`
cd
$(libmysql_dir)
&&
echo
*
.[ch]
`
;
do
\
for
f
in
`
cd
$(libmysql_dir)
&&
echo
*
.[ch]
`
;
do
\
rm
-f
$
(srcdir)
/
$
$
f
;
\
rm
-f
$$
f
;
\
@LN_CP_F@
$(libmysql_dir)
/
$$
f
$
(srcdir)
/
$
$
f
;
\
@LN_CP_F@
$(libmysql_dir)
/
$$
f
$$
f
;
\
done
done
libmysqld/Makefile.am
View file @
ee0b6db1
...
@@ -122,19 +122,19 @@ endif
...
@@ -122,19 +122,19 @@ endif
link_sources
:
link_sources
:
set
-x
;
\
set
-x
;
\
for
f
in
$(sqlsources)
;
do
\
for
f
in
$(sqlsources)
;
do
\
rm
-f
$
(srcdir)
/
$
$
f
;
\
rm
-f
$$
f
;
\
@LN_CP_F@
$(
srcdir)
/../sql/
$$
f
$(srcdir)
/
$$
f
;
\
@LN_CP_F@
$(
top_srcdir)
/sql/
$$
f
$$
f
;
\
done
;
\
done
;
\
for
f
in
$(libmysqlsources)
;
do
\
for
f
in
$(libmysqlsources)
;
do
\
rm
-f
$
(srcdir)
/
$
$
f
;
\
rm
-f
$$
f
;
\
@LN_CP_F@
$(
srcdir)
/../libmysql/
$$
f
$(srcdir)
/
$$
f
;
\
@LN_CP_F@
$(
top_srcdir)
/libmysql/
$$
f
$$
f
;
\
done
;
\
done
;
\
for
f
in
$(sqlexamplessources)
;
do
\
for
f
in
$(sqlexamplessources)
;
do
\
rm
-f
$
(srcdir)
/
$
$
f
;
\
rm
-f
$$
f
;
\
@LN_CP_F@
$(
srcdir)
/../sql/examples/
$$
f
$(srcdir)
/
$$
f
;
\
@LN_CP_F@
$(
top_srcdir)
/sql/examples/
$$
f
$$
f
;
\
done
;
\
done
;
\
rm
-f
$(srcdir)
/
client_settings.h
;
\
rm
-f
client_settings.h
;
\
@LN_CP_F@
$(
srcdir)
/../libmysql/client_settings.h
$(srcdir)
/client_settings.h
;
@LN_CP_F@
$(
top_srcdir)
/libmysql/client_settings.h client_settings.h
clean-local
:
clean-local
:
...
...
libmysqld/examples/Makefile.am
View file @
ee0b6db1
...
@@ -20,14 +20,15 @@ client_sources = $(mysqltest_embedded_SOURCES) $(mysql_SOURCES)
...
@@ -20,14 +20,15 @@ client_sources = $(mysqltest_embedded_SOURCES) $(mysql_SOURCES)
tests_sources
=
$(mysql_client_test_embedded_SOURCES)
tests_sources
=
$(mysql_client_test_embedded_SOURCES)
link_sources
:
link_sources
:
set
-x
;
\
for
f
in
$(client_sources)
;
do
\
for
f
in
$(client_sources)
;
do
\
rm
-f
$
(srcdir)
/
$
$
f
;
\
rm
-f
$$
f
;
\
@LN_CP_F@
$(
srcdir)
/../../client/
$$
f
$(srcdir)
/
$$
f
;
\
@LN_CP_F@
$(
top_srcdir)
/client/
$$
f
$$
f
;
\
done
;
done
;
\
for
f
in
$(tests_sources)
;
do
\
for
f
in
$(tests_sources)
;
do
\
rm
-f
$
(srcdir)
/
$
$
f
;
\
rm
-f
$$
f
;
\
@LN_CP_F@
$(
srcdir)
/../../tests/
$$
f
$(srcdir)
/
$$
f
;
\
@LN_CP_F@
$(
top_srcdir)
/tests/
$$
f
$$
f
;
\
done
;
done
DEFS
=
-DEMBEDDED_LIBRARY
DEFS
=
-DEMBEDDED_LIBRARY
INCLUDES
=
@MT_INCLUDES@
\
INCLUDES
=
@MT_INCLUDES@
\
...
@@ -48,7 +49,7 @@ mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD)
...
@@ -48,7 +49,7 @@ mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD)
mysql_client_test_embedded_LINK
=
$(CXXLINK)
mysql_client_test_embedded_LINK
=
$(CXXLINK)
mysql_client_test_embedded_SOURCES
=
mysql_client_test.c
mysql_client_test_embedded_SOURCES
=
mysql_client_test.c
clean
:
clean
-local
:
rm
-f
$(client_sources)
rm
-f
$(client_sources)
rm
-f
$(tests_sources)
rm
-f
$(tests_sources)
...
...
mysql-test/Makefile.am
View file @
ee0b6db1
...
@@ -87,6 +87,9 @@ install-data-local:
...
@@ -87,6 +87,9 @@ install-data-local:
$(INSTALL_DATA)
$(srcdir)
/lib/init_db.sql
$(DESTDIR)$(testdir)
/lib
$(INSTALL_DATA)
$(srcdir)
/lib/init_db.sql
$(DESTDIR)$(testdir)
/lib
$(INSTALL_DATA)
$(srcdir)
/lib/
*
.pl
$(DESTDIR)$(testdir)
/lib
$(INSTALL_DATA)
$(srcdir)
/lib/
*
.pl
$(DESTDIR)$(testdir)
/lib
uninstall-local
:
@
RM@
-f
-r
$(DESTDIR)$(testdir)
std_data/client-key.pem
:
std_data/client-key.pem
:
@
CP@
$(top_srcdir)
/SSL/
$
(
@F
)
$(srcdir)
/std_data
@
CP@
$(top_srcdir)
/SSL/
$
(
@F
)
$(srcdir)
/std_data
std_data/client-cert.pem
:
std_data/client-cert.pem
:
...
...
ndb/docs/Makefile.am
View file @
ee0b6db1
DOXYDIR
=
doxygen
DOXYDIR
=
doxygen
noinst_HEADERS
=
$(DOXYDIR)
/predoxy.pl
$(DOXYDIR)
/postdoxy.pl
$(DOXYDIR)
/Doxyfile.ndbapi
$(DOXYDIR)
/Doxyfile.mgmapi
$(DOXYDIR)
/header.ndbapi.tex
$(DOXYDIR)
/header.mgmapi.tex
noinst_HEADERS
=
$(DOXYDIR)
/predoxy.pl
$(DOXYDIR)
/postdoxy.pl
$(DOXYDIR)
/Doxyfile.ndbapi
$(DOXYDIR)
/Doxyfile.mgmapi
$(DOXYDIR)
/header.ndbapi.tex
$(DOXYDIR)
/header.mgmapi.tex
all
:
do-check ndbapidoc mgmapidoc
DOXYTMP
=
.doxytmp
DOXYTMP
=
.doxytmp
DOXYOUT
=
.doxyout
DOXYOUT
=
.doxyout
NDB_RELEASE
=
@NDB_VERSION_MAJOR@.@NDB_VERSION_MINOR@.@NDB_VERSION_BUILD@-@NDB_VERSION_STATUS@
NDB_RELEASE
=
@NDB_VERSION_MAJOR@.@NDB_VERSION_MINOR@.@NDB_VERSION_BUILD@-@NDB_VERSION_STATUS@
clean
:
clean
-local
:
rm
-rf
ndbapi.pdf ndbapi.html mgmapi.pdf mgmapi.html
rm
-rf
ndbapi.pdf ndbapi.html mgmapi.pdf mgmapi.html
rm
-rf
$(DOXYTMP)
$(DOXYOUT)
rm
-rf
$(DOXYTMP)
$(DOXYOUT)
...
...
netware/Makefile.am
View file @
ee0b6db1
...
@@ -42,10 +42,10 @@ netware_build_files = client/mysql.def client/mysqladmin.def \
...
@@ -42,10 +42,10 @@ netware_build_files = client/mysql.def client/mysqladmin.def \
link_sources
:
link_sources
:
set
-x
;
\
set
-x
;
\
for
f
in
$(netware_build_files)
;
do
\
for
f
in
$(netware_build_files)
;
do
\
rm
-f
$(srcdir)
/
../
$$
f
;
\
rm
-f
../
$$
f
;
\
org
=
`
echo
$$
f |
sed
-e
's/.*\/\(.*\)/\1/g'
`
;
\
org
=
`
echo
$$
f |
sed
-e
's/.*\/\(.*\)/\1/g'
`
;
\
@LN_CP_F@
$(srcdir)
/
$$
org
$(srcdir)
/
../
$$
f
;
\
@LN_CP_F@
$(srcdir)
/
$$
org ../
$$
f
;
\
done
;
done
else
else
EXTRA_DIST
=
comp_err.def init_db.sql install_test_db.ncf
\
EXTRA_DIST
=
comp_err.def init_db.sql install_test_db.ncf
\
isamchk.def isamlog.def libmysql.def libmysql.imp
\
isamchk.def isamlog.def libmysql.def libmysql.imp
\
...
...
pstack/Makefile.am
View file @
ee0b6db1
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
#
#
SUBDIRS
=
aout
SUBDIRS
=
aout
INCLUDES
=
-I
$(top_srcdir)
/include
INCLUDES
=
-I
$(top_
builddir)
/include
-I
$(top_
srcdir)
/include
noinst_HEADERS
=
bucomm.h debug.h ieee.h budbg.h demangle.h
\
noinst_HEADERS
=
bucomm.h debug.h ieee.h budbg.h demangle.h
\
linuxthreads.h pstack.h pstacktrace.h
linuxthreads.h pstack.h pstacktrace.h
SRC
=
bucomm.c filemode.c linuxthreads.c rddbg.c
\
SRC
=
bucomm.c filemode.c linuxthreads.c rddbg.c
\
...
...
scripts/Makefile.am
View file @
ee0b6db1
...
@@ -85,12 +85,13 @@ CLEANFILES = @server_scripts@ \
...
@@ -85,12 +85,13 @@ CLEANFILES = @server_scripts@ \
mysql_find_rows
\
mysql_find_rows
\
mysqlhotcopy
\
mysqlhotcopy
\
mysqldumpslow
\
mysqldumpslow
\
mysql_explain_log
\
mysql_tableinfo
\
mysqld_multi
\
mysqld_multi
\
make_win_src_distribution
\
make_win_src_distribution
\
make_win_binary_distribution
\
mysql_create_system_tables
mysql_create_system_tables
SUPER
CLEANFILES
=
mysqlbug
DIST
CLEANFILES
=
mysqlbug
# We want the right version and configure comand line in mysqlbug
# We want the right version and configure comand line in mysqlbug
mysqlbug
:
${top_builddir}/config.status mysqlbug.sh
mysqlbug
:
${top_builddir}/config.status mysqlbug.sh
...
...
sql-bench/Makefile.am
View file @
ee0b6db1
...
@@ -60,6 +60,8 @@ install-data-local:
...
@@ -60,6 +60,8 @@ install-data-local:
for
i
in
$(srcdir)
/limits/
*
.
*
;
do
$(INSTALL_DATA)
$$
i
$(DESTDIR)$(benchdir)
/limits
;
done
for
i
in
$(srcdir)
/limits/
*
.
*
;
do
$(INSTALL_DATA)
$$
i
$(DESTDIR)$(benchdir)
/limits
;
done
for
i
in
$(srcdir)
/Comments/
*
.
*
;
do
$(INSTALL_DATA)
$$
i
$(DESTDIR)$(benchdir)
/Comments
;
done
for
i
in
$(srcdir)
/Comments/
*
.
*
;
do
$(INSTALL_DATA)
$$
i
$(DESTDIR)$(benchdir)
/Comments
;
done
uninstall-local
:
@
RM@
-f
-r
$(DESTDIR)$(benchdir)
SUFFIXES
=
.sh
SUFFIXES
=
.sh
...
...
sql/Makefile.am
View file @
ee0b6db1
...
@@ -111,17 +111,17 @@ AM_YFLAGS = -d
...
@@ -111,17 +111,17 @@ AM_YFLAGS = -d
mysql_tzinfo_to_sql.cc
:
mysql_tzinfo_to_sql.cc
:
rm
-f
mysql_tzinfo_to_sql.cc
rm
-f
mysql_tzinfo_to_sql.cc
@
LN_CP_F@ tztime.cc mysql_tzinfo_to_sql.cc
@
LN_CP_F@
$(srcdir)
/
tztime.cc mysql_tzinfo_to_sql.cc
link_sources
:
mysql_tzinfo_to_sql.cc
link_sources
:
mysql_tzinfo_to_sql.cc
rm
-f
mini_client_errors.c
rm
-f
mini_client_errors.c
@
LN_CP_F@
..
/libmysql/errmsg.c mini_client_errors.c
@
LN_CP_F@
$(top_srcdir)
/libmysql/errmsg.c mini_client_errors.c
rm
-f
pack.c
rm
-f
pack.c
@
LN_CP_F@
..
/sql-common/pack.c pack.c
@
LN_CP_F@
$(top_srcdir)
/sql-common/pack.c pack.c
rm
-f
client.c
rm
-f
client.c
@
LN_CP_F@
..
/sql-common/client.c client.c
@
LN_CP_F@
$(top_srcdir)
/sql-common/client.c client.c
rm
-f
my_time.c
rm
-f
my_time.c
@
LN_CP_F@
..
/sql-common/my_time.c my_time.c
@
LN_CP_F@
$(top_srcdir)
/sql-common/my_time.c my_time.c
mysql_tzinfo_to_sql.o
:
$(mysql_tzinfo_to_sql_SOURCES)
mysql_tzinfo_to_sql.o
:
$(mysql_tzinfo_to_sql_SOURCES)
$(CXXCOMPILE)
-c
$(INCLUDES)
-DTZINFO2SQL
$<
$(CXXCOMPILE)
-c
$(INCLUDES)
-DTZINFO2SQL
$<
...
@@ -145,7 +145,7 @@ lex_hash.h: gen_lex_hash$(EXEEXT)
...
@@ -145,7 +145,7 @@ lex_hash.h: gen_lex_hash$(EXEEXT)
udf_example.so
:
udf_example.cc
udf_example.so
:
udf_example.cc
$(CXXCOMPILE)
-shared
-o
$@
$<
$(CXXCOMPILE)
-shared
-o
$@
$<
distclean
:
distclean
-local
:
rm
-f
lex_hash.h
rm
-f
lex_hash.h
# Don't update the files from bitkeeper
# Don't update the files from bitkeeper
...
...
sql/share/Makefile.am
View file @
ee0b6db1
...
@@ -43,6 +43,13 @@ install-data-local:
...
@@ -43,6 +43,13 @@ install-data-local:
$(INSTALL_DATA)
$(srcdir)
/charsets/README
$(DESTDIR)$(pkgdatadir)
/charsets/README
$(INSTALL_DATA)
$(srcdir)
/charsets/README
$(DESTDIR)$(pkgdatadir)
/charsets/README
$(INSTALL_DATA)
$(srcdir)
/charsets/
*
.xml
$(DESTDIR)$(pkgdatadir)
/charsets
$(INSTALL_DATA)
$(srcdir)
/charsets/
*
.xml
$(DESTDIR)$(pkgdatadir)
/charsets
# FIXME maybe shouldn't remove, could be needed by other installation?
uninstall-local
:
@
RM@
-f
-r
$(DESTDIR)$(pkgdatadir)
# Do nothing
link_sources
:
fix_errors
:
fix_errors
:
for
lang
in
@AVAILABLE_LANGUAGES@
;
\
for
lang
in
@AVAILABLE_LANGUAGES@
;
\
do
\
do
\
...
...
support-files/Makefile.am
View file @
ee0b6db1
...
@@ -107,7 +107,5 @@ SUFFIXES = .sh
...
@@ -107,7 +107,5 @@ SUFFIXES = .sh
$<
>
$@
-t
$<
>
$@
-t
@
MV@
$@
-t
$@
@
MV@
$@
-t
$@
all
:
binary-configure
# Don't update the files from bitkeeper
# Don't update the files from bitkeeper
%
::
SCCS/s.%
%
::
SCCS/s.%
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