diff options
| author | msvensson@pilot.blaudden <> | 2007-04-23 14:02:09 +0200 |
|---|---|---|
| committer | msvensson@pilot.blaudden <> | 2007-04-23 14:02:09 +0200 |
| commit | 402d71299190b9ce8a4953d0df9df498cd3584f2 (patch) | |
| tree | b008fd06651185f3ff82911b118f1df115baea47 /scripts/Makefile.am | |
| parent | b941ef86330a77d2a52375f766abf6490ad414d0 (diff) | |
| parent | 1561c39c5d91370178999584ddd30d7314ce1a8a (diff) | |
| download | mariadb-git-402d71299190b9ce8a4953d0df9df498cd3584f2.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
Diffstat (limited to 'scripts/Makefile.am')
| -rw-r--r-- | scripts/Makefile.am | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index ff3bfceb78d..9d344118f2b 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -15,6 +15,11 @@ ## Process this file with automake to create Makefile.in +BUILT_SOURCES = mysql_fix_privilege_tables.sql \ + mysql_fix_privilege_tables_sql.c + +noinst_PROGRAMS = comp_sql + bin_SCRIPTS = @server_scripts@ \ msql2mysql \ mysql_config \ @@ -83,7 +88,8 @@ CLEANFILES = @server_scripts@ \ mysqldumpslow \ mysql_tableinfo \ mysqld_multi \ - mysql_fix_privilege_tables.sql + mysql_fix_privilege_tables.sql \ + mysql_fix_privilege_tables_sql.c # mysqlbug should be distributed built so that people can report build # failures with it. @@ -100,6 +106,17 @@ mysql_fix_privilege_tables.sql: mysql_system_tables.sql \ @echo "Building $@"; @cat mysql_system_tables.sql mysql_system_tables_fix.sql > $@ +# +# Build mysql_fix_privilege_tables_sql.c from +# mysql_fix_privileges_tables.sql using comp_sql +# +mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix_privilege_tables.sql + $(MAKE) $(AM_MAKEFLAGS) comp_sql$(EXEEXT) + $(top_builddir)/scripts/comp_sql$(EXEEXT) \ + mysql_fix_privilege_tables \ + $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@ + + SUFFIXES = .sh .sh: @@ -156,18 +173,5 @@ SUFFIXES = .sh @MV@ $@-t $@ -BUILT_SOURCES = mysql_fix_privilege_tables_sql.c -noinst_PROGRAMS = comp_sql - -# -# Build mysql_fix_privilege_tables_sql.c from -# mysql_fix_privileges_tables.sql using comp_sql -# -mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix_privilege_tables.sql - $(MAKE) $(AM_MAKEFLAGS) comp_sql$(EXEEXT) - $(top_builddir)/scripts/comp_sql$(EXEEXT) \ - mysql_fix_privilege_tables.sql $@ - - # Don't update the files from bitkeeper %::SCCS/s.% |