diff options
| author | unknown <monty@mysql.com> | 2004-06-27 20:07:21 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-06-27 20:07:21 +0300 |
| commit | f90b266fa555d29f0606c641516f5192a1697555 (patch) | |
| tree | 67c980cc929a17bb7245d2dfb53c78497768573c /sql/Makefile.am | |
| parent | f37e8fb999e828704e2f92707897715a337e9842 (diff) | |
| download | mariadb-git-f90b266fa555d29f0606c641516f5192a1697555.tar.gz | |
Ensure that we don't create long temporary .o file (breaks on qnx)
Diffstat (limited to 'sql/Makefile.am')
| -rw-r--r-- | sql/Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index 9777e1b8533..384a4565bb9 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -91,11 +91,10 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc \ gstream.cc spatial.cc sql_help.cc protocol_cursor.cc \ tztime.cc my_time.c \ examples/ha_example.cc examples/ha_archive.cc + gen_lex_hash_SOURCES = gen_lex_hash.cc gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS) - -mysql_tzinfo_to_sql_SOURCES = mysql_tzinfo_to_sql_tztime.cc -mysql_tzinfo_to_sql_CXXFLAGS = -DTZINFO2SQL $(AM_CXXFLAGS) +mysql_tzinfo_to_sql_SOURCES = mysql_tzinfo_to_sql.cc mysql_tzinfo_to_sql_LDADD = $(LDADD) $(CXXLDFLAGS) DEFS = -DMYSQL_SERVER \ @@ -117,13 +116,14 @@ link_sources: @LN_CP_F@ ../sql-common/client.c client.c rm -f my_time.c @LN_CP_F@ ../sql-common/my_time.c my_time.c + rm -f mysql_tzinfo_to_sql.cc + @LN_CP_F@ tztime.cc mysql_tzinfo_to_sql.cc gen_lex_hash.o: gen_lex_hash.cc lex.h $(CXXCOMPILE) -c $(INCLUDES) $< -mysql_tzinfo_to_sql_tztime.cc: tztime.cc - rm -f $(srcdir)/mysql_tzinfo_to_sql_tztime.cc - @LN_CP_F@ $(srcdir)/tztime.cc $(srcdir)/mysql_tzinfo_to_sql_tztime.cc +mysql_tzinfo_to_sql.o: $(mysql_tzinfo_to_sql_SOURCES) + $(CXXCOMPILE) -c $(INCLUDES) -DTZINFO2SQL $< # Try to get better dependencies for the grammar. Othervise really bad # things like different grammars for different pars of MySQL can |