diff options
| author | unknown <msvensson@shellback.(none)> | 2006-09-18 21:55:56 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-09-18 21:55:56 +0200 |
| commit | 9d04dee35f74236af2be5f5ee020a8e2105c86ef (patch) | |
| tree | b7f95dccb309f924e17baf2cd6474df8704e1861 /extra | |
| parent | 35af88b78fb8d0a2c3e5de4d43fd51dd8677b5d5 (diff) | |
| parent | fb63fdb9eec07e815bda7d94a4d9632ede9380db (diff) | |
| download | mariadb-git-9d04dee35f74236af2be5f5ee020a8e2105c86ef.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
extra/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/share/errmsg.txt:
Auto merged
storage/innobase/Makefile.am:
Auto merged
storage/innobase/handler/ha_innodb.cc:
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 de8e519e641..c87be2c02aa 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -22,11 +22,16 @@ 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) SUBDIRS = @yassl_dir@ -# 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/ \ |