diff options
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/Makefile.am | 4 | ||||
| -rw-r--r-- | libmysql/Makefile.shared | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am index 68c2022223e..85bca62d19c 100644 --- a/libmysql/Makefile.am +++ b/libmysql/Makefile.am @@ -44,6 +44,10 @@ link_sources: rm -f $(srcdir)/$$f; \ @LN_CP_F@ $(srcdir)/../strings/$$f $(srcdir)/$$f; \ done; \ + for f in $(mystringsgen); do \ + rm -f $(srcdir)/$$f; \ + @LN_CP_F@ ../strings/$$f $(srcdir)/$$f; \ + done; \ for f in $$ds; do \ rm -f $(srcdir)/$$f; \ @LN_CP_F@ $(srcdir)/../dbug/$$f $(srcdir)/$$f; \ diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index 76d37c149c9..d1271173b24 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -41,7 +41,8 @@ mystringsobjects = strmov.lo strxmov.lo strnmov.lo strmake.lo strend.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 +mystringsgen= ctype_autoconf.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 \ @@ -76,8 +77,8 @@ 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"` \ - $(mystringsextra) $(mysysheaders) ctype_extra_sources.c \ - ../linked_client_sources + $(mystringsextra) $(mystringsgen) $(mysysheaders) \ + ctype_extra_sources.c ../linked_client_sources ctype_extra_sources.c: conf_to_src ./conf_to_src $(top_srcdir) @CHARSETS_NEED_SOURCE@ > \ |