diff options
| author | unknown <joerg@trift2.> | 2007-05-03 18:08:06 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-05-03 18:08:06 +0200 |
| commit | 70d440ace34f3897c8930975069cc960df47fc6e (patch) | |
| tree | 71c2596178a22facfeca87d2212ae7a4ed3f8bf8 /scripts/Makefile.am | |
| parent | f32d1e9b4962b91b8b83ab67f435925130b4a82e (diff) | |
| parent | ad33a48afc21c7c89e7ea893ea826e305bd09258 (diff) | |
| download | mariadb-git-70d440ace34f3897c8930975069cc960df47fc6e.tar.gz | |
Merge trift2.:/MySQL/M50/netware-cross-5.0
into trift2.:/MySQL/M51/netware-cross-5.1
scripts/Makefile.am:
Manual merge.
Diffstat (limited to 'scripts/Makefile.am')
| -rw-r--r-- | scripts/Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 04ed57a0cd7..0507385500e 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -16,7 +16,7 @@ ## Process this file with automake to create Makefile.in BUILT_SOURCES = mysql_fix_privilege_tables.sql \ - mysql_fix_privilege_tables_sql.c + mysql_fix_privilege_tables_sql.c EXTRA_PROGRAMS = comp_sql @@ -62,7 +62,6 @@ EXTRA_DIST = $(EXTRA_SCRIPTS) \ mysqlaccess.conf \ mysqlbug \ make_win_bin_dist \ - mysql_fix_privilege_tables.sql \ mysql_fix_privilege_tables_sql.c \ mysql_system_tables_fix.sql \ CMakeLists.txt @@ -89,13 +88,11 @@ CLEANFILES = @server_scripts@ \ mysqlhotcopy \ mysqldumpslow \ mysql_tableinfo \ - mysqld_multi \ - mysql_fix_privilege_tables.sql \ - mysql_fix_privilege_tables_sql.c + mysqld_multi # mysqlbug should be distributed built so that people can report build # failures with it. -DISTCLEANFILES = mysqlbug +DISTCLEANFILES = $(BUILT_SOURCES) mysqlbug # We want the right version and configure comand line in mysqlbug mysqlbug: ${top_builddir}/config.status mysqlbug.sh @@ -111,9 +108,12 @@ mysql_fix_privilege_tables.sql: mysql_system_tables.sql \ # # Build mysql_fix_privilege_tables_sql.c from # mysql_fix_privileges_tables.sql using comp_sql +# The "sleep" ensures the generated file has a younger timestamp than its source +# (which may have been generated in this very same "make" run). # mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix_privilege_tables.sql $(MAKE) $(AM_MAKEFLAGS) comp_sql$(EXEEXT) + sleep 2 $(top_builddir)/scripts/comp_sql$(EXEEXT) \ mysql_fix_privilege_tables \ $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@ |