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
3edbb869
Commit
3edbb869
authored
Aug 29, 2001
by
monty@tik.mysql.fi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix to be able to configure without --with-tools
parent
6680695f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
17 deletions
+10
-17
Makefile.am
Makefile.am
+1
-7
configure.in
configure.in
+1
-1
libmysql/Makefile.shared
libmysql/Makefile.shared
+8
-1
tools/Makefile.am
tools/Makefile.am
+0
-8
No files found.
Makefile.am
View file @
3edbb869
...
@@ -29,8 +29,7 @@ SUBDIRS = include @docs_dirs@ @readline_dir@ \
...
@@ -29,8 +29,7 @@ SUBDIRS = include @docs_dirs@ @readline_dir@ \
# Relink after clean
# Relink after clean
linked_sources
=
linked_client_sources linked_server_sources
\
linked_sources
=
linked_client_sources linked_server_sources
\
linked_libmysql_sources linked_libmysql_r_sources
\
linked_libmysql_sources linked_libmysql_r_sources
\
linked_libmysqld_sources linked_include_sources
\
linked_libmysqld_sources linked_include_sources
linked_tools_sources
CLEANFILES
=
$(linked_sources)
CLEANFILES
=
$(linked_sources)
...
@@ -45,11 +44,6 @@ linked_client_sources: @linked_client_targets@
...
@@ -45,11 +44,6 @@ linked_client_sources: @linked_client_targets@
cd
client
;
$(MAKE)
link_sources
cd
client
;
$(MAKE)
link_sources
echo
timestamp
>
linked_client_sources
echo
timestamp
>
linked_client_sources
linked_tools_sources
:
cd
tools
;
$(MAKE)
link_sources
echo
timestamp
>
linked_tools_sources
linked_libmysql_sources
:
linked_libmysql_sources
:
cd
libmysql
;
$(MAKE)
link_sources
cd
libmysql
;
$(MAKE)
link_sources
echo
timestamp
>
linked_libmysql_sources
echo
timestamp
>
linked_libmysql_sources
...
...
configure.in
View file @
3edbb869
...
@@ -1694,7 +1694,7 @@ then
...
@@ -1694,7 +1694,7 @@ then
else
else
tools_dirs
=
""
tools_dirs
=
""
fi
fi
AC_SUBST
(
[
tools_dirs]
)
AC_SUBST
(
tools_dirs
)
MYSQL_CHECK_CPU
MYSQL_CHECK_CPU
MYSQL_CHECK_MYSQLFS
MYSQL_CHECK_MYSQLFS
...
...
libmysql/Makefile.shared
View file @
3edbb869
...
@@ -56,7 +56,14 @@ mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \
...
@@ -56,7 +56,14 @@ mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \
thr_mutex.lo mulalloc.lo string.lo default.lo
\
thr_mutex.lo mulalloc.lo string.lo default.lo
\
my_compress.lo array.lo my_once.lo list.lo my_net.lo
\
my_compress.lo array.lo my_once.lo list.lo my_net.lo
\
charset.lo hash.lo mf_iocache.lo my_seek.lo
\
charset.lo hash.lo mf_iocache.lo my_seek.lo
\
my_pread.lo mf_cache.lo
my_pread.lo mf_cache.lo my_vsnprintf.lo
link_sources
:
for
f
in
$(mysys_src)
;
do
\
rm
-f
$$
f
;
\
@LN_CP_F@ ../mysys/
$$
f
$$
f
;
\
done
;
# Not needed in the minimum library
# Not needed in the minimum library
mysysobjects2
=
getopt.lo getopt1.lo getvar.lo my_lib.lo
mysysobjects2
=
getopt.lo getopt1.lo getvar.lo my_lib.lo
mysysobjects
=
$(mysysobjects1)
$(mysysobjects2)
mysysobjects
=
$(mysysobjects1)
$(mysysobjects2)
...
...
tools/Makefile.am
View file @
3edbb869
...
@@ -8,14 +8,6 @@ mysqlmngd_SOURCES = mysqlmngd.c my_vsnprintf.c
...
@@ -8,14 +8,6 @@ mysqlmngd_SOURCES = mysqlmngd.c my_vsnprintf.c
mysqltest_DEPENDENCIES
=
$(LIBRARIES)
$(pkglib_LTLIBRARIES)
mysqltest_DEPENDENCIES
=
$(LIBRARIES)
$(pkglib_LTLIBRARIES)
DEFS
=
-DUNDEF_THREADS_HACK
DEFS
=
-DUNDEF_THREADS_HACK
mysys_src
=
my_vsnprintf.c mysys_priv.h
link_sources
:
for
f
in
$(mysys_src)
;
do
\
rm
-f
$$
f
;
\
@LN_CP_F@ ../mysys/
$$
f
$$
f
;
\
done
;
# 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