diff options
| author | unknown <kent@kent-amd64.(none)> | 2006-12-02 23:22:53 +0100 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2006-12-02 23:22:53 +0100 |
| commit | 531f2eeddfdef71b265a399f521e7cce3e8ce9d7 (patch) | |
| tree | 70c4448334ba144f499e655f1ecb9eb7f736cfa5 /include | |
| parent | 68a5b1d22520380755f73e85c8bf60eab7bc0d37 (diff) | |
| parent | 1172c8ae5568374de74037644a9a082722df9fab (diff) | |
| download | mariadb-git-531f2eeddfdef71b265a399f521e7cce3e8ce9d7.tar.gz | |
Merge mysql.com:/home/kent/bk/mysql-5.0-build
into mysql.com:/home/kent/bk/mysql-5.1-build
Makefile.am:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index af061f80ff2..34362ee70ba 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -15,14 +15,17 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA -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 \ +BUILT_SOURCES = $(HEADERS_GEN) abi_check +HEADERS_GEN = mysql_version.h my_config.h +HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \ + my_list.h my_alloc.h typelib.h +pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \ + my_xml.h mysql_embed.h \ my_semaphore.h my_pthread.h my_no_pthread.h \ - errmsg.h my_global.h my_net.h my_alloc.h \ - my_getopt.h sslopt-longopts.h my_dir.h typelib.h \ + errmsg.h my_global.h my_net.h \ + my_getopt.h sslopt-longopts.h my_dir.h \ sslopt-vars.h sslopt-case.h sql_common.h keycache.h \ - mysql_time.h m_ctype.h mysql/plugin.h $(BUILT_SOURCES) + m_ctype.h mysql/plugin.h $(HEADERS_GEN) noinst_HEADERS = config-win.h config-netware.h \ heap.h my_bitmap.h my_uctype.h \ myisam.h myisampack.h myisammrg.h ft_global.h\ @@ -61,8 +64,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 mysql_h.ic +abi_check: $(HEADERS_ABI) mysql_version.h mysql_h.ic @set -ex; \ if [ @ICHECK@ != no ] ; then \ @ICHECK@ --canonify --skip-from-re /usr/ -o $@.ic mysql.h; \ @@ -70,8 +72,5 @@ abi_check: mysql.h mysql_version.h mysql_com.h mysql_time.h my_list.h \ fi; \ touch abi_check; -#all: abi_check - - # Don't update the files from bitkeeper %::SCCS/s.% |