diff options
Diffstat (limited to 'libmysql/Makefile.shared')
| -rw-r--r-- | libmysql/Makefile.shared | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index b1c7438543f..2bcf95f467d 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -31,13 +31,14 @@ 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 \ - get_password.c errmsg.c +target_sources = libmysql.c password.c manager.c \ + get_password.c errmsg.c -mystringsobjects = strmov.lo strxmov.lo strnmov.lo strmake.lo strend.lo \ +mystringsobjects = strmov.lo strxmov.lo strxnmov.lo strnmov.lo \ + strmake.lo strend.lo \ strnlen.lo strfill.lo is_prefix.lo \ int2str.lo str2int.lo strinstr.lo strcont.lo \ - strcend.lo \ + strcend.lo bcmp.lo \ bchange.lo bmove.lo bmove_upp.lo longlong2str.lo \ strtoull.lo strtoll.lo llstr.lo \ ctype.lo $(LTCHARSET_OBJS) @@ -56,13 +57,19 @@ mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \ mf_loadpath.lo my_pthread.lo my_thr_init.lo \ thr_mutex.lo mulalloc.lo string.lo default.lo \ my_compress.lo array.lo my_once.lo list.lo my_net.lo \ - charset.lo hash.lo mf_iocache.lo my_seek.lo \ - my_pread.lo mf_cache.lo my_gethostbyname.lo my_port.lo + charset.lo hash.lo mf_iocache.lo \ + mf_iocache2.lo my_seek.lo \ + my_pread.lo mf_cache.lo my_vsnprintf.lo md5.lo \ + my_getopt.lo my_gethostbyname.lo my_port.lo +sqlobjects = net.lo + # Not needed in the minimum library -mysysobjects2 = getopt.lo getopt1.lo getvar.lo my_lib.lo +mysysobjects2 = my_lib.lo mysysobjects = $(mysysobjects1) $(mysysobjects2) -target_libadd = $(mysysobjects) $(mystringsobjects) $(dbugobjects) +target_libadd = $(mysysobjects) $(mystringsobjects) $(dbugobjects) \ + $(vio_objects) $(sqlobjects) target_ldflags = -version-info @SHARED_LIB_VERSION@ +vio_objects= vio.lo viosocket.lo viossl.lo viosslfactories.lo CLEANFILES = $(target_libadd) $(SHLIBOBJS) \ $(target) DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ @@ -80,7 +87,7 @@ clean-local: `echo $(vio_objects) | sed "s;\.lo;.c;g"` \ $(CHARSET_SRCS) $(CHARSET_OBJS) \ $(mystringsextra) $(mystringsgen) $(mysysheaders) \ - ctype_extra_sources.c ../linked_client_sources + ctype_extra_sources.c net.c ../linked_client_sources ctype_extra_sources.c: conf_to_src ./conf_to_src $(top_srcdir) @CHARSETS_NEED_SOURCE@ > \ |