Commit f1b8bea1 authored by unknown's avatar unknown

Remove the hack to let lex_hash.h depend on it's tool and not the sources

parent 03715238
...@@ -26,7 +26,7 @@ INCLUDES = @ZLIB_INCLUDES@ \ ...@@ -26,7 +26,7 @@ INCLUDES = @ZLIB_INCLUDES@ \
WRAPLIBS= @WRAPLIBS@ WRAPLIBS= @WRAPLIBS@
SUBDIRS = share SUBDIRS = share
libexec_PROGRAMS = mysqld libexec_PROGRAMS = mysqld
noinst_PROGRAMS = gen_lex_hash EXTRA_PROGRAMS = gen_lex_hash
bin_PROGRAMS = mysql_tzinfo_to_sql bin_PROGRAMS = mysql_tzinfo_to_sql
gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@ gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@
SUPPORTING_LIBS = $(top_builddir)/vio/libvio.a \ SUPPORTING_LIBS = $(top_builddir)/vio/libvio.a \
...@@ -149,10 +149,11 @@ link_sources: mysql_tzinfo_to_sql.cc ...@@ -149,10 +149,11 @@ link_sources: mysql_tzinfo_to_sql.cc
mysql_tzinfo_to_sql.o: $(mysql_tzinfo_to_sql_SOURCES) mysql_tzinfo_to_sql.o: $(mysql_tzinfo_to_sql_SOURCES)
$(CXXCOMPILE) -c $(INCLUDES) -DTZINFO2SQL $< $(CXXCOMPILE) -c $(INCLUDES) -DTZINFO2SQL $<
# FIXME seems like now "lex_hash.h" differs depending on configure # This generates lex_hash.h
# flags, so can't pregenerate and include in source TAR. Revert to # NOTE Built sources should depend on their sources not the tool
# dist pregenerated if this changes, so the file doesn't differ. # this avoid the rebuild of the built files in a source dist
lex_hash.h: gen_lex_hash$(EXEEXT) lex_hash.h: gen_lex_hash.cc lex.h
$(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
./gen_lex_hash$(EXEEXT) > $@-t ./gen_lex_hash$(EXEEXT) > $@-t
$(MV) $@-t $@ $(MV) $@-t $@
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment