diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-04 09:32:36 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-04 09:32:36 +0100 |
| commit | 2ab170619045ff9df0237243fa2895894a8eaa25 (patch) | |
| tree | 357220cc8fc6a4c356b47725488ff2ea2eeb854c /include | |
| parent | c88ab7a093c07be904398981fc8f42291bab08ff (diff) | |
| parent | 9db512b3505b4de618ae583e0403bcf027876faa (diff) | |
| download | mariadb-git-2ab170619045ff9df0237243fa2895894a8eaa25.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
include/Makefile.am:
Auto merged
mysql-test/t/disabled.def:
SCCS merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 3faa25c4bb9..af061f80ff2 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -15,7 +15,7 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA -BUILT_SOURCES = mysql_version.h my_config.h abi_check +BUILT_SOURCES = mysql_version.h my_config.h pkginclude_HEADERS = my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \ mysql.h mysql_com.h mysql_embed.h \ my_semaphore.h my_pthread.h my_no_pthread.h \ @@ -62,7 +62,7 @@ dist-hook: # Create a icheck file and compare it to the reference abi_check: mysql.h mysql_version.h mysql_com.h mysql_time.h my_list.h \ - my_alloc.h typelib.h + my_alloc.h typelib.h mysql_h.ic @set -ex; \ if [ @ICHECK@ != no ] ; then \ @ICHECK@ --canonify --skip-from-re /usr/ -o $@.ic mysql.h; \ |