mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
symlink sql/violite.c to libmysql/violite.c, since violite.c got removed
from libmysql directory to make things compile
This commit is contained in:
parent
aec1ed037a
commit
ac379c408a
2 changed files with 12 additions and 2 deletions
|
@ -35,6 +35,7 @@ link_sources:
|
|||
set -x; \
|
||||
ss=`echo $(mystringsobjects) | 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"`; \
|
||||
for f in $$ss; do \
|
||||
rm -f $(srcdir)/$$f; \
|
||||
|
@ -44,6 +45,10 @@ link_sources:
|
|||
rm -f $(srcdir)/$$f; \
|
||||
@LN_CP_F@ $(srcdir)/../strings/$$f $(srcdir)/$$f; \
|
||||
done; \
|
||||
for f in $$qs; do \
|
||||
rm -f $(srcdir)/$$f; \
|
||||
@LN_CP_F@ $(srcdir)/../sql/$$f $(srcdir)/$$f; \
|
||||
done; \
|
||||
for f in $$ds; do \
|
||||
rm -f $(srcdir)/$$f; \
|
||||
@LN_CP_F@ $(srcdir)/../dbug/$$f $(srcdir)/$$f; \
|
||||
|
|
|
@ -31,9 +31,12 @@ noinst_PROGRAMS = conf_to_src
|
|||
CHARSET_OBJS=@CHARSET_OBJS@
|
||||
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
|
||||
|
||||
#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 \
|
||||
strnlen.lo strfill.lo is_prefix.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 \
|
|||
# Not needed in the minimum library
|
||||
mysysobjects2 = getopt.lo getopt1.lo getvar.lo my_lib.lo
|
||||
mysysobjects = $(mysysobjects1) $(mysysobjects2)
|
||||
target_libadd = $(mysysobjects) $(mystringsobjects) $(dbugobjects)
|
||||
target_libadd = $(mysysobjects) $(mystringsobjects) $(dbugobjects)\
|
||||
$(sqlobjects)
|
||||
target_ldflags = -version-info @SHARED_LIB_VERSION@
|
||||
CLEANFILES = $(target_libadd) $(SHLIBOBJS) \
|
||||
$(target)
|
||||
|
@ -75,6 +79,7 @@ clean-local:
|
|||
rm -f `echo $(mystringsobjects) | sed "s;\.lo;.c;g"` \
|
||||
`echo $(dbugobjects) | 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 \
|
||||
../linked_client_sources
|
||||
|
||||
|
|
Loading…
Reference in a new issue