Commit 109bd52e authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/bug10777/my51-bug10777 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


sql/Makefile.am:
  Auto merged
parents 9590b338 f1b8bea1

sql/Makefile.am

+8 −6
Original line number Diff line number Diff line
@@ -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 \
@@ -150,11 +150,13 @@ 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)

		./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 $@



# the following three should eventually be moved out of this directory

ha_ndbcluster.o:ha_ndbcluster.cc ha_ndbcluster.h