diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-01-30 16:43:23 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-01-30 16:43:23 +0200 |
| commit | 2e75dda33ebc7468f777f55e403c1d40a00ec0e0 (patch) | |
| tree | b9ebb0c9950f8fa52958d1198e6df31c21cee7a3 /libmysql | |
| parent | 4e17ec5a298b118e7f86df8d470abf06d3d5dbad (diff) | |
| parent | 5bcf3a242c753449dde504a1a27712ad48b3ed8c (diff) | |
| download | mariadb-git-2e75dda33ebc7468f777f55e403c1d40a00ec0e0.tar.gz | |
Merge with 5.1
Fixed a couple of compilation failures that was not detected before merge.
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/Makefile.am | 2 | ||||
| -rw-r--r-- | libmysql/Makefile.shared | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am index b628bff9a3f..af10794f693 100644 --- a/libmysql/Makefile.am +++ b/libmysql/Makefile.am @@ -41,7 +41,7 @@ link_sources: ms=`echo $(mysysobjects) | sed "s;\.lo;.c;g"`; \ vs=`echo $(vio_objects) | sed "s;\.lo;.c;g"`; \ scs=`echo $(sql_cmn_objects) | sed "s;\.lo;.c;g"`; \ - for f in $$ss; do \ + for f in $$ss $(mystringsheaders); do \ rm -f $$f; \ @LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \ done; \ diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index bdac91c803d..472846d356b 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -50,6 +50,7 @@ mystringsobjects = strmov.lo strxmov.lo strxnmov.lo strnmov.lo \ strmov_overlapp.lo mystringsextra= strto.c +mystringsheaders= strings_def.h dbugobjects = dbug.lo # IT IS IN SAFEMALLOC.C sanity.lo mysysheaders = mysys_priv.h my_static.h vioheaders = vio_priv.h |