diff options
| author | acurtis@xiphis.org <> | 2006-04-24 13:36:15 -0700 |
|---|---|---|
| committer | acurtis@xiphis.org <> | 2006-04-24 13:36:15 -0700 |
| commit | 53d4594cfe03a9b440edf09639635a024e04b079 (patch) | |
| tree | 8d426c8740820381d4c07c02035f4a4bf29c2fa3 /libmysqld | |
| parent | afdb3faae15e2b992fb09ce9c0cb7d475bdb6902 (diff) | |
| parent | 91801e5cc051b60c1d9670438f614c73d759f7da (diff) | |
| download | mariadb-git-53d4594cfe03a9b440edf09639635a024e04b079.tar.gz | |
Merge xiphis.org:/home/antony/work2/wl3201.3
into xiphis.org:/home/antony/work2/wl3201.merge
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index a869a3ccfe9..09176097be0 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -44,7 +44,10 @@ libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \ noinst_HEADERS = embedded_priv.h emb_qcache.h sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ - ha_heap.cc ha_myisam.cc ha_myisammrg.cc handler.cc sql_handler.cc \ + ha_heap.cc ha_myisam.cc ha_myisammrg.cc \ + ha_innodb.cc ha_berkeley.cc ha_federated.cc ha_ndbcluster.cc \ + ha_ndbcluster_binlog.cc ha_partition.cc \ + handler.cc sql_handler.cc \ hostname.cc init.cc password.c \ item.cc item_buff.cc item_cmpfunc.cc item_create.cc \ item_func.cc item_strfunc.cc item_sum.cc item_timefunc.cc \ @@ -65,17 +68,12 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ spatial.cc gstream.cc sql_help.cc tztime.cc sql_cursor.cc \ sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \ parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \ - event_executor.cc event.cc event_timed.cc \ - rpl_filter.cc sql_partition.cc handlerton.cc sql_plugin.cc \ - sql_tablespace.cc \ - rpl_injector.cc my_user.c partition_info.cc + event_executor.cc event.cc event_timed.cc \ + rpl_filter.cc sql_partition.cc sql_builtin.cc sql_plugin.cc \ + sql_tablespace.cc \ + rpl_injector.cc my_user.c partition_info.cc libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) -EXTRA_libmysqld_a_SOURCES = ha_innodb.cc ha_berkeley.cc ha_archive.cc \ - ha_blackhole.cc ha_federated.cc ha_ndbcluster.cc \ - ha_ndbcluster_binlog.cc \ - ha_partition.cc -libmysqld_a_DEPENDENCIES= @mysql_se_objs@ libmysqld_a_SOURCES= sqlstoragesources = $(EXTRA_libmysqld_a_SOURCES) @@ -85,15 +83,11 @@ sql_yacc.cc sql_yacc.h: $(top_srcdir)/sql/sql_yacc.yy # The following libraries should be included in libmysqld.a INC_LIB= $(top_builddir)/regex/libregex.a \ - $(top_builddir)/storage/myisam/libmyisam.a \ - $(top_builddir)/storage/myisammrg/libmyisammrg.a \ - $(top_builddir)/storage/archive/libarchive.a \ - $(top_builddir)/storage/heap/libheap.a \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/strings/libmystrings.a \ $(top_builddir)/dbug/libdbug.a \ $(top_builddir)/vio/libvio.a \ - @mysql_se_libs@ \ + @mysql_plugin_libs@ \ $(yassl_las) if HAVE_YASSL |