bk commit into 5.0 tree (msvensson:1.2232) BUG#19738

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-18 21:11:34+02:00, msvensson@shellback.(none) +2 -0
  BUG#19738 "make install" tries to build files that "make" should already have built
   - Make built sources only depend on it's sources not the built tool

  extra/Makefile.am@stripped, 2006-09-18 21:11:29+02:00, msvensson@shellback.(none) +8 -3
    The files built by "comp_err" should only depend on their sources not the tool comp_err
    The built sources should only be cleaned by "make distclean"  

  sql/Makefile.am@stripped, 2006-09-18 21:11:29+02:00, msvensson@shellback.(none) +5 -1
    The built file "lex_hash.h" should depend on it's sources  

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/bug19738/my50-bug19738

--- 1.32/extra/Makefile.am	2006-09-18 21:11:41 +02:00
+++ 1.33/extra/Makefile.am	2006-09-18 21:11:41 +02:00
@@ -22,14 +22,19 @@
                         $(top_builddir)/include/sql_state.h \
                         $(top_builddir)/include/mysqld_ername.h
 pkginclude_HEADERS=	$(BUILT_SOURCES)
-CLEANFILES =		$(BUILT_SOURCES)
+DISTCLEANFILES =	$(BUILT_SOURCES)
 # We never use SUBDIRS here, but needed for automake 1.6.3
 # to generate code to handle DIST_SUBDIRS
 SUBDIRS=
 DIST_SUBDIRS=           yassl
 
-# This will build mysqld_error.h and sql_state.h
-$(top_builddir)/include/mysqld_error.h: comp_err$(EXEEXT)
+# This will build mysqld_error.h, mysqld_ername.h and sql_state.h
+# NOTE Built files should depend on their sources to avoid
+# the built files being rebuilt in source dist
+$(top_builddir)/include/mysqld_error.h: comp_err.c \
+			$(top_srcdir)/sql/share/errmsg.txt \
+			$(wildcard $(top_srcdir)/sql/share/charsets/*.xml)
+	$(MAKE) $(AM_MAKEFLAGS) comp_err$(EXEEXT)
 	$(top_builddir)/extra/comp_err$(EXEEXT) \
 	--charset=$(top_srcdir)/sql/share/charsets \
 	--out-dir=$(top_builddir)/sql/share/ \

--- 1.119/sql/Makefile.am	2006-09-18 21:11:41 +02:00
+++ 1.120/sql/Makefile.am	2006-09-18 21:11:41 +02:00
@@ -150,7 +150,11 @@
 		@echo "If it fails, re-run configure with --with-low-memory"
 		$(CXXCOMPILE) $(LM_CFLAGS) -c $<
 
-lex_hash.h:	gen_lex_hash$(EXEEXT)
+# This generates lex_hash.h
+# NOTE Built sources should depend on their sources not the tool
+# this avoid the rebuild of the built files in a source dist
+lex_hash.h:	gen_lex_hash.cc lex.h
+		$(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
 		./gen_lex_hash$(EXEEXT) > $@
 
 # For testing of udf_example.so