diff options
| author | unknown <kent@mysql.com> | 2005-06-20 22:31:25 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-06-20 22:31:25 +0200 |
| commit | 2bf4fa73de38c2d353a9b1263f80251b4641419a (patch) | |
| tree | 30e813eeac6497e704de9c34b5b3f6a43862a482 /sql/Makefile.am | |
| parent | d83c264305ca019613b268c98d84dba97b17dc10 (diff) | |
| parent | d73327e1996d172640d063b6ac22a0d21be26562 (diff) | |
| download | mariadb-git-2bf4fa73de38c2d353a9b1263f80251b4641419a.tar.gz | |
Merge
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/group_by.result:
Auto merged
sql/Makefile.am:
Auto merged
sql/field.h:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/Makefile.am')
| -rw-r--r-- | sql/Makefile.am | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index b506d2a767b..524ec93a6a9 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -111,8 +111,8 @@ DEFS = -DMYSQL_SERVER \ -DDATADIR="\"$(MYSQLDATAdir)\"" \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \ @DEFS@ -# Don't put lex_hash.h in BUILT_SOURCES as this will give infinite recursion -BUILT_SOURCES = sql_yacc.cc sql_yacc.h + +BUILT_SOURCES = sql_yacc.cc sql_yacc.h lex_hash.h EXTRA_DIST = udf_example.cc $(BUILT_SOURCES) DISTCLEANFILES = lex_hash.h AM_YFLAGS = -d @@ -131,9 +131,6 @@ link_sources: mysql_tzinfo_to_sql.cc rm -f my_time.c @LN_CP_F@ ../sql-common/my_time.c my_time.c -gen_lex_hash.o: gen_lex_hash.cc lex.h - $(CXXCOMPILE) -c $(INCLUDES) $< - mysql_tzinfo_to_sql.o: $(mysql_tzinfo_to_sql_SOURCES) $(CXXCOMPILE) -c $(INCLUDES) -DTZINFO2SQL $< @@ -148,13 +145,9 @@ sql_yacc.o: sql_yacc.cc sql_yacc.h $(HEADERS) @echo "If it fails, re-run configure with --with-low-memory" $(CXXCOMPILE) $(LM_CFLAGS) -c $< -lex_hash.h: lex.h gen_lex_hash.cc sql_yacc.h - $(MAKE) gen_lex_hash$(EXEEXT) +lex_hash.h: gen_lex_hash$(EXEEXT) ./gen_lex_hash$(EXEEXT) > $@ -# Hack to ensure that lex_hash.h is built early -sql_lex.o: lex_hash.h - # For testing of udf_example.so; Works on platforms with gcc # (This is not part of our build process but only provided as an example) udf_example.so: udf_example.cc |