Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738

into  shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738


extra/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
This commit is contained in:
unknown 2006-09-18 21:15:38 +02:00
commit fb63fdb9ee
2 changed files with 13 additions and 4 deletions

View file

@ -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/ \