diff options
| author | monty@hundin.mysql.fi <> | 2002-08-08 15:24:47 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-08-08 15:24:47 +0300 |
| commit | 087261482a9bbdaa3bc0e26052a719ebdb73644b (patch) | |
| tree | e7f4a2013ed3d66e640f6574e62cb7e534a5d77f /libmysql | |
| parent | 8be1cdeb89ca59be790d58dc0d43993cdc4f4191 (diff) | |
| parent | 3f48e0369b2e49026e9ddd4fddcee68ebe17db1e (diff) | |
| download | mariadb-git-087261482a9bbdaa3bc0e26052a719ebdb73644b.tar.gz | |
merge with 3.23.52
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/Makefile.am | 3 | ||||
| -rw-r--r-- | libmysql/Makefile.shared | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am index 3d380c14076..e72f73a39f9 100644 --- a/libmysql/Makefile.am +++ b/libmysql/Makefile.am @@ -49,6 +49,9 @@ 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; \ for f in $$qs; do \ rm -f $(srcdir)/$$f; \ @LN_CP_F@ $(srcdir)/../sql/$$f $(srcdir)/$$f; \ diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index 87f9fe42a3c..98bcd173fc6 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -42,7 +42,8 @@ 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 +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 \ @@ -83,9 +84,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"` \ - `echo $(vio_objects) | sed "s;\.lo;.c;g"` \ - $(mystringsextra) $(mysysheaders) ctype_extra_sources.c \ - net.c ../linked_client_sources + $(mystringsextra) $(mystringsgen) $(mysysheaders) \ + ctype_extra_sources.c net.c ../linked_client_sources ctype_extra_sources.c: conf_to_src ./conf_to_src $(top_srcdir) @CHARSETS_NEED_SOURCE@ > \ |