diff options
| author | msvensson@shellback.(none) <> | 2006-09-18 21:55:20 +0200 |
|---|---|---|
| committer | msvensson@shellback.(none) <> | 2006-09-18 21:55:20 +0200 |
| commit | d94fa536821b66729ee505f2f58e2c9ba6eb36b8 (patch) | |
| tree | 60313d9815622fa27c82653744b256c96b565f68 /extra | |
| parent | 52fd031f325931a19a055d657b1bd481da8b10e8 (diff) | |
| parent | b50c843b2595b83fc55f1fe0452ba6fa9ba55d06 (diff) | |
| download | mariadb-git-d94fa536821b66729ee505f2f58e2c9ba6eb36b8.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/Makefile.am | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/extra/Makefile.am b/extra/Makefile.am index 0de513ba15a..fb6aa0ec89f 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -22,14 +22,19 @@ BUILT_SOURCES= $(top_builddir)/include/mysqld_error.h \ $(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/ \ |