diff options
| author | unknown <bar@gw.udmsearch.izhnet.ru> | 2002-03-06 17:44:43 +0400 |
|---|---|---|
| committer | unknown <bar@gw.udmsearch.izhnet.ru> | 2002-03-06 17:44:43 +0400 |
| commit | 0cc0dbc1ed62ac8c98664077cb8cca6e117899d8 (patch) | |
| tree | 162ee341ea0ce026de8b530629e9e5c2bddc993f /libmysql | |
| parent | 1a7c7d763cb34b52c723c526b2e8b38432e7dec1 (diff) | |
| download | mariadb-git-0cc0dbc1ed62ac8c98664077cb8cca6e117899d8.tar.gz | |
Charsets related things are prepared by configure in new way.
This is to simplify maintaining charsets, especially changing
CHARSET_INFO structure.
acconfig.h:
New defines for charsets
configure.in:
New way to build charsets
include/m_ctype.h:
Prototypes, moved from ctype_autoconf.c
libmysql/Makefile.shared:
Removed ctype_autoconf.c and ctype_extra_sources.c from target dependancies
strings/Makefile.am:
The same with above
strings/conf_to_src.c:
Remove unnecessary comment
strings/ctype-czech.c:
Fix for possible bugs that prototypes was not included
strings/ctype-euc_kr.c:
Fix for possible bugs that prototypes was not included
strings/ctype-gb2312.c:
Fix for possible bugs that prototypes was not included
strings/ctype-ujis.c:
Fix for possible bugs that prototypes was not included
strings/ctype.c:
Move tables from ctype_extra_sources.c and hide them under #ifdefs
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/Makefile.shared | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index 0d3aa79b9ce..93cbf130f18 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -42,7 +42,7 @@ mystringsobjects = strmov.lo strxmov.lo strxnmov.lo strnmov.lo \ bchange.lo bmove.lo bmove_upp.lo longlong2str.lo \ strtoull.lo strtoll.lo llstr.lo \ ctype.lo $(LTCHARSET_OBJS) -mystringsextra= strto.c ctype_autoconf.c +mystringsextra= strto.c dbugobjects = dbug.lo # IT IS IN SAFEMALLOC.C sanity.lo mysysheaders = mysys_priv.h my_static.h mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \ @@ -75,19 +75,15 @@ DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ # The automatic dependencies miss this bmove_upp.lo: $(LTCHARSET_OBJS) -ctype.lo: ctype_extra_sources.c 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 $(vio_objects) | sed "s;\.lo;.c;g"` \ - $(mystringsextra) $(mysysheaders) ctype_extra_sources.c \ + $(mystringsextra) $(mysysheaders) \ ../linked_client_sources -ctype_extra_sources.c: conf_to_src - ./conf_to_src $(top_srcdir) @CHARSETS_NEED_SOURCE@ > \ - $(srcdir)/ctype_extra_sources.c conf_to_src_SOURCES = conf_to_src.c conf_to_src_LDADD= #force static linking of conf_to_src - essential when linking against |