diff options
author | sasha@mysql.sashanet.com <> | 2001-05-24 14:34:45 -0600 |
---|---|---|
committer | sasha@mysql.sashanet.com <> | 2001-05-24 14:34:45 -0600 |
commit | ac379c408a9597df642410714be7126a8e9dd0ac (patch) | |
tree | 73c4387816f109b9d07c95becb9fcd789c2beae6 /libmysql/Makefile.shared | |
parent | aec1ed037a7debd0ec9d24acdcc152a7569bcae3 (diff) | |
download | mariadb-git-ac379c408a9597df642410714be7126a8e9dd0ac.tar.gz |
symlink sql/violite.c to libmysql/violite.c, since violite.c got removed
from libmysql directory to make things compile
Diffstat (limited to 'libmysql/Makefile.shared')
-rw-r--r-- | libmysql/Makefile.shared | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index cd19868ec33..7b220e12346 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -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 |