database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Better distinction between "CLEANFILES" and "DISTCLEANFILES" for some generated files

Browse Source 
(here: "scripts/mysql_fix_privilege_tables{.sql,_sql.c}"). Important for cross-builds.


scripts/Makefile.am:
  Generated files like "mysql_fix_privilege_tables{.sql,_sql.c}" should survive
  a "make clean", this is essential for cross-builds.
  So move them from "CLEANFILES" to "DISTCLEANFILES".
This commit is contained in:
unknown
2007-05-03 15:51:02 +02:00
parent dc39e2c20e
commit ad33a48afc
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/Makefile.am
View File

@ -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
@ -70,7 +70,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
@ -100,13 +99,11 @@ CLEANFILES = @server_scripts@ \
mysql_tableinfo \
mysql_upgrade_shell \
mysqld_multi \
make_win_src_distribution \
mysql_fix_privilege_tables.sql \
mysql_fix_privilege_tables_sql.c
make_win_src_distribution
# 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
@ -122,11 +119,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.
# 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 5
sleep 2
$(top_builddir)/scripts/comp_sql$(EXEEXT) \
mysql_fix_privilege_tables \
$(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@