From 1172c8ae5568374de74037644a9a082722df9fab Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 2 Dec 2006 23:16:47 +0100 Subject: mysql_install_db.sh: If --srcdir and --windows is given, check if error message file is in source or build tree (bug#24557) Makefile.am: Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557) mysql_install_db.sh: Added --srcdir=DIR option, used from top Makefile.am in dist-hook target, to find "fill_help_tables.sql" in VPATH build (bug#24557) Makefile.am: Work around problem with "distcleancheck", "sql_yacc.cc" might be in both the source and build tree. Call "mysql_install_db" with new option --srcdir, to enable the script to find all that is needed, if source and build directory is not the same (bug#24557) scripts/mysql_install_db.sh: If --srcdir and --windows is given, check if error message file is in source or build tree (bug#24557) Makefile.am: Work around problem with "distcleancheck", "sql_yacc.cc" might be in both the source and build tree. Call "mysql_install_db" with new option --srcdir, to enable the script to find all that is needed, if source and build directory is not the same (bug#24557) include/Makefile.am: Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557) --- include/Makefile.am | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'include') diff --git a/include/Makefile.am b/include/Makefile.am index 3500503207c..8a4799149d0 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 \ - my_semaphore.h my_pthread.h my_no_pthread.h raid.h \ - errmsg.h my_global.h my_net.h my_alloc.h \ - my_getopt.h sslopt-longopts.h my_dir.h typelib.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 raid.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 $(BUILT_SOURCES) + m_ctype.h $(HEADERS_GEN) noinst_HEADERS = config-win.h config-os2.h config-netware.h \ heap.h my_bitmap.h\ myisam.h myisampack.h myisammrg.h ft_global.h\ @@ -59,8 +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 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; \ @@ -68,8 +70,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.% -- cgit v1.2.1