diff options
| author | unknown <msvensson@shellback.(none)> | 2006-09-18 21:55:20 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-09-18 21:55:20 +0200 |
| commit | fc78e7ffeea235db1557599383e8dc376a2dbe6e (patch) | |
| tree | 60313d9815622fa27c82653744b256c96b565f68 /extra | |
| parent | d0e1dda11519fd0a7ce0a00d2c4102c886cb754d (diff) | |
| parent | b0b0b7c17907773ce6989a142c9af6197eb9cae7 (diff) | |
| download | mariadb-git-fc78e7ffeea235db1557599383e8dc376a2dbe6e.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
extra/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
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/ \ |