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
ac379c40
Commit
ac379c40
authored
May 24, 2001
by
sasha@mysql.sashanet.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
symlink sql/violite.c to libmysql/violite.c, since violite.c got removed
from libmysql directory to make things compile
parent
aec1ed03
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
libmysql/Makefile.am
libmysql/Makefile.am
+5
-0
libmysql/Makefile.shared
libmysql/Makefile.shared
+7
-2
No files found.
libmysql/Makefile.am
View file @
ac379c40
...
@@ -35,6 +35,7 @@ link_sources:
...
@@ -35,6 +35,7 @@ link_sources:
set
-x
;
\
set
-x
;
\
ss
=
`
echo
$(mystringsobjects)
|
sed
"s;
\.
lo;.c;g"
`
;
\
ss
=
`
echo
$(mystringsobjects)
|
sed
"s;
\.
lo;.c;g"
`
;
\
ds
=
`
echo
$(dbugobjects)
|
sed
"s;
\.
lo;.c;g"
`
;
\
ds
=
`
echo
$(dbugobjects)
|
sed
"s;
\.
lo;.c;g"
`
;
\
qs
=
`
echo
$(sqlobjects)
|
sed
"s;
\.
lo;.c;g"
`
;
\
ms
=
`
echo
$(mysysobjects)
|
sed
"s;
\.
lo;.c;g"
`
;
\
ms
=
`
echo
$(mysysobjects)
|
sed
"s;
\.
lo;.c;g"
`
;
\
for
f
in
$$
ss
;
do
\
for
f
in
$$
ss
;
do
\
rm
-f
$(srcdir)
/
$$
f
;
\
rm
-f
$(srcdir)
/
$$
f
;
\
...
@@ -44,6 +45,10 @@ link_sources:
...
@@ -44,6 +45,10 @@ link_sources:
rm
-f
$(srcdir)
/
$$
f
;
\
rm
-f
$(srcdir)
/
$$
f
;
\
@LN_CP_F@
$(srcdir)
/../strings/
$$
f
$(srcdir)
/
$$
f
;
\
@LN_CP_F@
$(srcdir)
/../strings/
$$
f
$(srcdir)
/
$$
f
;
\
done
;
\
done
;
\
for
f
in
$$
qs
;
do
\
rm
-f
$(srcdir)
/
$$
f
;
\
@LN_CP_F@
$(srcdir)
/../sql/
$$
f
$(srcdir)
/
$$
f
;
\
done
;
\
for
f
in
$$
ds
;
do
\
for
f
in
$$
ds
;
do
\
rm
-f
$(srcdir)
/
$$
f
;
\
rm
-f
$(srcdir)
/
$$
f
;
\
@LN_CP_F@
$(srcdir)
/../dbug/
$$
f
$(srcdir)
/
$$
f
;
\
@LN_CP_F@
$(srcdir)
/../dbug/
$$
f
$(srcdir)
/
$$
f
;
\
...
...
libmysql/Makefile.shared
View file @
ac379c40
...
@@ -31,9 +31,12 @@ noinst_PROGRAMS = conf_to_src
...
@@ -31,9 +31,12 @@ noinst_PROGRAMS = conf_to_src
CHARSET_OBJS
=
@CHARSET_OBJS@
CHARSET_OBJS
=
@CHARSET_OBJS@
LTCHARSET_OBJS
=
${CHARSET_OBJS:.o=.lo}
LTCHARSET_OBJS
=
${CHARSET_OBJS:.o=.lo}
target_sources
=
libmysql.c net.c
violite.c
password.c
\
target_sources
=
libmysql.c net.c password.c
\
get_password.c errmsg.c
get_password.c errmsg.c
#quick easy dirty hack to make it work after Tonu's changes
#In my opinion, violite.c really belongs into mysys - Sasha
sqlobjects
=
violite.lo
mystringsobjects
=
strmov.lo strxmov.lo strnmov.lo strmake.lo strend.lo
\
mystringsobjects
=
strmov.lo strxmov.lo strnmov.lo strmake.lo strend.lo
\
strnlen.lo strfill.lo is_prefix.lo
\
strnlen.lo strfill.lo is_prefix.lo
\
int2str.lo str2int.lo strinstr.lo strcont.lo
\
int2str.lo str2int.lo strinstr.lo strcont.lo
\
...
@@ -59,7 +62,8 @@ mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \
...
@@ -59,7 +62,8 @@ mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \
# 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)
target_libadd
=
$(mysysobjects)
$(mystringsobjects)
$(dbugobjects)
target_libadd
=
$(mysysobjects)
$(mystringsobjects)
$(dbugobjects)
\
$(sqlobjects)
target_ldflags
=
-version-info
@SHARED_LIB_VERSION@
target_ldflags
=
-version-info
@SHARED_LIB_VERSION@
CLEANFILES
=
$(target_libadd)
$(SHLIBOBJS)
\
CLEANFILES
=
$(target_libadd)
$(SHLIBOBJS)
\
$(target)
$(target)
...
@@ -75,6 +79,7 @@ clean-local:
...
@@ -75,6 +79,7 @@ clean-local:
rm
-f
`
echo
$(mystringsobjects)
|
sed
"s;
\.
lo;.c;g"
`
\
rm
-f
`
echo
$(mystringsobjects)
|
sed
"s;
\.
lo;.c;g"
`
\
`
echo
$(dbugobjects)
|
sed
"s;
\.
lo;.c;g"
`
\
`
echo
$(dbugobjects)
|
sed
"s;
\.
lo;.c;g"
`
\
`
echo
$(mysysobjects)
|
sed
"s;
\.
lo;.c;g"
`
\
`
echo
$(mysysobjects)
|
sed
"s;
\.
lo;.c;g"
`
\
`
echo
$(sqlobjects)
|
sed
"s;
\.
lo;.c;g"
`
\
$(mystringsextra)
$(mysysheaders)
ctype_extra_sources.c
\
$(mystringsextra)
$(mysysheaders)
ctype_extra_sources.c
\
../linked_client_sources
../linked_client_sources
...
...
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