diff options
| author | unknown <bar@gw.udmsearch.izhnet.ru> | 2002-03-19 20:03:10 +0400 |
|---|---|---|
| committer | unknown <bar@gw.udmsearch.izhnet.ru> | 2002-03-19 20:03:10 +0400 |
| commit | 51102c06ad2590dc4a9848eb5d119d7a9785731d (patch) | |
| tree | 9e73fc04adbb3cc7fd267b5624f7bed06ee2788d /libmysql/Makefile.shared | |
| parent | 8066715aa936ad6c642581feb39f5d48b089afa1 (diff) | |
| download | mariadb-git-51102c06ad2590dc4a9848eb5d119d7a9785731d.tar.gz | |
Configure.in/Makefile.in charset related things are now earier to maintain
Fixes in charset related C++ code
configure.in:
Make things to be easier managable
include/m_ctype.h:
Hide some functions under conditional compilation
libmysql/Makefile.shared:
Make things to be easier managable
sql/item_func.cc:
Fixed that private member is not available in this context
sql/item_strfunc.cc:
Fixed that private member is not available in this context
strings/Makefile.am:
Make charset things to be easier managable
Some fixes in charset C++ code
strings/ctype-big5.c:
Hide some functions under conditional compilation
strings/ctype-czech.c:
Hide some functions under conditional compilation
strings/ctype-euc_kr.c:
Hide some functions under conditional compilation
strings/ctype-gb2312.c:
Hide some functions under conditional compilation
strings/ctype-gbk.c:
Hide some functions under conditional compilation
strings/ctype-latin1_de.c:
Hide some functions under conditional compilation
strings/ctype-mb.c:
Hide some functions under conditional compilation
strings/ctype-sjis.c:
Hide some functions under conditional compilation
strings/ctype-tis620.c:
Hide some functions under conditional compilation
strings/ctype-ujis.c:
Hide some functions under conditional compilation
Diffstat (limited to 'libmysql/Makefile.shared')
| -rw-r--r-- | libmysql/Makefile.shared | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index f9b69124dbe..1dd176bbe27 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -27,9 +27,6 @@ pkglib_LTLIBRARIES = $(target) noinst_PROGRAMS = conf_to_src -# We need .lo, not .o files for everything. -CHARSET_OBJS=@CHARSET_OBJS@ -LTCHARSET_OBJS= ${CHARSET_OBJS:.o=.lo} target_sources = libmysql.c net.c password.c manager.c \ get_password.c errmsg.c @@ -41,7 +38,11 @@ mystringsobjects = strmov.lo strxmov.lo strxnmov.lo strnmov.lo \ strcend.lo bcmp.lo \ bchange.lo bmove.lo bmove_upp.lo longlong2str.lo \ strtoull.lo strtoll.lo llstr.lo \ - ctype.lo ctype-simple.lo ctype-mb.lo $(LTCHARSET_OBJS) + ctype.lo ctype-simple.lo ctype-mb.lo \ + ctype-big5.lo ctype-czech.lo ctype-euc_kr.lo \ + ctype-gb2312.lo ctype-gbk.lo ctype-latin1_de.lo \ + ctype-sjis.lo ctype-tis620.lo ctype-ujis.lo + mystringsextra= strto.c dbugobjects = dbug.lo # IT IS IN SAFEMALLOC.C sanity.lo mysysheaders = mysys_priv.h my_static.h @@ -74,7 +75,7 @@ DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs) # The automatic dependencies miss this -bmove_upp.lo: $(LTCHARSET_OBJS) +#bmove_upp.lo: $(LTCHARSET_OBJS) clean-local: rm -f `echo $(mystringsobjects) | sed "s;\.lo;.c;g"` \ |