diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-01-24 14:43:09 -0700 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-01-24 14:43:09 -0700 |
| commit | 53491b18009d0c38644896c1bc0c5aecfc6fbf44 (patch) | |
| tree | 561dff8f89d961e8ec7b9484ce861c3712c617c0 /sql/Makefile.am | |
| parent | 5c0216c593566377e2429a54fdab33babc0b70ab (diff) | |
| parent | 39cc6d117bb7dafc0634082399e97c03a44dc1c4 (diff) | |
| download | mariadb-git-53491b18009d0c38644896c1bc0c5aecfc6fbf44.tar.gz | |
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into weblab.(none):/home/marcsql/TREE/mysql-5.1-21029
Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/Makefile.am')
| -rw-r--r-- | sql/Makefile.am | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index 6cb9467c32c..264b469cd8c 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -121,13 +121,14 @@ DEFS = -DMYSQL_SERVER \ -DLIBDIR="\"$(MYSQLLIBdir)\"" \ @DEFS@ -BUILT_DIST_SRC = sql_yacc.cc sql_yacc.h -BUILT_SOURCES = $(BUILT_DIST_SRC) lex_hash.h -EXTRA_DIST = udf_example.c udf_example.def $(BUILT_DIST_SRC) \ +BUILT_MAINT_SRC = sql_yacc.cc sql_yacc.h +BUILT_SOURCES = $(BUILT_MAINT_SRC) lex_hash.h +EXTRA_DIST = udf_example.c udf_example.def $(BUILT_MAINT_SRC) \ nt_servc.cc nt_servc.h message.mc CMakeLists.txt \ udf_example.c udf_example.def -CLEANFILES = lex_hash.h sql_yacc.cc sql_yacc.h sql_yacc.output -AM_YFLAGS = -d --debug --verbose +CLEANFILES = lex_hash.h sql_yacc.output +MAINTAINERCLEANFILES = $(BUILT_MAINT_SRC) +AM_YFLAGS = -d --verbose mysql_tzinfo_to_sql.cc: rm -f mysql_tzinfo_to_sql.cc @@ -148,23 +149,6 @@ link_sources: mysql_tzinfo_to_sql.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 -# happen if you are unlucky. -sql_yacc.cc: sql_yacc.yy - -sql_yacc.h: sql_yacc.yy - -# Be careful here, note that we use VPATH and might or might not have -# a pregenerated "sql_yacc.cc" in $(srcdir) or one we just built in -# $(builddir). And it has to work if $(srcdir) == $(builddir). -sql_yacc.o: sql_yacc.cc sql_yacc.h $(HEADERS) - @SED@ -e 's/__attribute__ ((__unused__))//' $< > sql_yacc.cc-new - @MV@ sql_yacc.cc-new sql_yacc.cc - @echo "Note: The following compile may take a long time." - @echo "If it fails, re-run configure with --with-low-memory" - $(CXXCOMPILE) $(LM_CFLAGS) -c sql_yacc.cc - # 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. |