summaryrefslogtreecommitdiff
path: root/libmysql/Makefile.shared
diff options
context:
space:
mode:
authorunknown <hf@deer.mysql.r18.ru>2003-04-23 19:37:33 +0500
committerunknown <hf@deer.mysql.r18.ru>2003-04-23 19:37:33 +0500
commitf0909cd71a7a1d0904845af4e5e06d213f911de1 (patch)
treeca16079f1d4f7eae6f2205e124d0c90afbec8409 /libmysql/Makefile.shared
parent7c87a3f140ac801c0922b3a24e59381f627f105a (diff)
downloadmariadb-git-f0909cd71a7a1d0904845af4e5e06d213f911de1.tar.gz
SCRUM
Protocol_cursor class and sql-common/ directory Makefile.am: pack.c added to linked sources include/mysql.h: net_field_length_ll declaration added include/mysql_com.h: net_field_length declaration added libmysql/Makefile.am: sql-common files symlinked libmysql/Makefile.shared: pack.lo target added libmysql/libmysql.c: net_field_length removed from here sql/Makefile.am: pack.c added to the sources sql/mini_client.cc: mc_net_field_length functions replaced with net_field_length sql/protocol.h: Protocol_cursor class added
Diffstat (limited to 'libmysql/Makefile.shared')
-rw-r--r--libmysql/Makefile.shared4
1 files changed, 3 insertions, 1 deletions
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared
index 60d6b320bb6..1067bc2bd41 100644
--- a/libmysql/Makefile.shared
+++ b/libmysql/Makefile.shared
@@ -63,12 +63,13 @@ mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \
my_pread.lo mf_cache.lo md5.lo sha1.lo\
my_getopt.lo my_gethostbyname.lo my_port.lo
sqlobjects = net.lo
+sql_cmn_objects = pack.lo
# Not needed in the minimum library
mysysobjects2 = my_lib.lo
mysysobjects = $(mysysobjects1) $(mysysobjects2)
target_libadd = $(mysysobjects) $(mystringsobjects) $(dbugobjects) \
- $(vio_objects) $(sqlobjects)
+ $(sql_cmn_objects) $(vio_objects) $(sqlobjects)
target_ldflags = -version-info @SHARED_LIB_VERSION@
vio_objects= vio.lo viosocket.lo viossl.lo viosslfactories.lo
CLEANFILES = $(target_libadd) $(SHLIBOBJS) \
@@ -85,6 +86,7 @@ clean-local:
`echo $(dbugobjects) | sed "s;\.lo;.c;g"` \
`echo $(mysysobjects) | sed "s;\.lo;.c;g"` \
`echo $(vio_objects) | sed "s;\.lo;.c;g"` \
+ `echo $(sql_cmn_objects) | sed "s;\.lo;.c;g"` \
$(CHARSET_SRCS) $(CHARSET_OBJS) \
$(mystringsextra) $(mysysheaders) \
../linked_client_sources net.c