diff options
| author | msvensson@neptunus.(none) <> | 2007-02-15 15:44:56 +0100 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2007-02-15 15:44:56 +0100 |
| commit | c11432eb4b62eec0ce18450d36a19105fbcb8a97 (patch) | |
| tree | 072d51946c5a29bbacd1377f9bf1fa1ba7f3aa9f | |
| parent | 8903aad4cd461b2398d53d186f28c8a5cf7c021e (diff) | |
| download | mariadb-git-c11432eb4b62eec0ce18450d36a19105fbcb8a97.tar.gz | |
Remove the hack to let lex_hash.h depend on it's tool and not the sources
| -rw-r--r-- | sql/Makefile.am | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index 3f4332fb562..189dc2c9a7b 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -26,7 +26,7 @@ INCLUDES = @ZLIB_INCLUDES@ \ WRAPLIBS= @WRAPLIBS@ SUBDIRS = share libexec_PROGRAMS = mysqld -noinst_PROGRAMS = gen_lex_hash +EXTRA_PROGRAMS = gen_lex_hash bin_PROGRAMS = mysql_tzinfo_to_sql gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@ SUPPORTING_LIBS = $(top_builddir)/vio/libvio.a \ @@ -149,10 +149,11 @@ link_sources: mysql_tzinfo_to_sql.cc mysql_tzinfo_to_sql.o: $(mysql_tzinfo_to_sql_SOURCES) $(CXXCOMPILE) -c $(INCLUDES) -DTZINFO2SQL $< -# FIXME seems like now "lex_hash.h" differs depending on configure -# flags, so can't pregenerate and include in source TAR. Revert to -# dist pregenerated if this changes, so the file doesn't differ. -lex_hash.h: gen_lex_hash$(EXEEXT) +# This generates lex_hash.h +# NOTE Built sources should depend on their sources not the tool +# this avoid the rebuild of the built files in a source dist +lex_hash.h: gen_lex_hash.cc lex.h + $(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT) ./gen_lex_hash$(EXEEXT) > $@-t $(MV) $@-t $@ |