diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-06-25 11:02:17 -0600 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-06-25 11:02:17 -0600 |
| commit | 0f719e7407bbdb8399c1292d76e3c5a2cea71636 (patch) | |
| tree | 0dde65756ebd8c877d13b7de57f90661bda35c9b /sql/Makefile.am | |
| parent | 36151ca356040aa197eaf54169e32a4e0a12c3b6 (diff) | |
| parent | ba7e22dbe4acab510c78e163f1993fbf569b6f2d (diff) | |
| download | mariadb-git-0f719e7407bbdb8399c1292d76e3c5a2cea71636.tar.gz | |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
sql/Makefile.am:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/Makefile.am')
| -rw-r--r-- | sql/Makefile.am | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index a379a950c41..b77f2fb6cf6 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -27,6 +27,10 @@ SUBDIRS = share libexec_PROGRAMS = mysqld EXTRA_PROGRAMS = gen_lex_hash bin_PROGRAMS = mysql_tzinfo_to_sql + +noinst_LTLIBRARIES= libndb.la \ + udf_example.la + SUPPORTING_LIBS = $(top_builddir)/vio/libvio.a \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/dbug/libdbug.a \ @@ -34,7 +38,8 @@ SUPPORTING_LIBS = $(top_builddir)/vio/libvio.a \ $(top_builddir)/strings/libmystrings.a mysqld_DEPENDENCIES= @mysql_plugin_libs@ $(SUPPORTING_LIBS) LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@ -mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ +mysqld_LDADD = libndb.la \ + @MYSQLD_EXTRA_LDFLAGS@ \ @pstack_libs@ \ @mysql_plugin_libs@ \ $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \ @@ -94,8 +99,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \ log_event_old.cc rpl_record_old.cc \ discover.cc time.cc opt_range.cc opt_sum.cc \ records.cc filesort.cc handler.cc \ - ha_ndbcluster.cc ha_ndbcluster_cond.cc \ - ha_ndbcluster_binlog.cc ha_partition.cc \ + ha_partition.cc \ sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \ sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc \ sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc \ @@ -116,6 +120,11 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \ sql_builtin.cc sql_tablespace.cc partition_info.cc \ sql_servers.cc +libndb_la_CPPFLAGS= @ndbcluster_includes@ +libndb_la_SOURCES= ha_ndbcluster.cc \ + ha_ndbcluster_binlog.cc \ + ha_ndbcluster_cond.cc + gen_lex_hash_SOURCES = gen_lex_hash.cc gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@ @@ -159,22 +168,7 @@ lex_hash.h: gen_lex_hash.cc lex.h ./gen_lex_hash$(EXEEXT) > $@-t $(MV) $@-t $@ -# the following four should eventually be moved out of this directory -ha_ndbcluster.o:ha_ndbcluster.cc ha_ndbcluster.h - $(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $< - -ha_ndbcluster_cond.o:ha_ndbcluster_cond.cc ha_ndbcluster_cond.h - $(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $< - -ha_ndbcluster_binlog.o:ha_ndbcluster_binlog.cc ha_ndbcluster_binlog.h - $(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $< - -#Until we can get rid of dependencies on ha_ndbcluster.h -handler.o: handler.cc ha_ndbcluster.h - $(CXXCOMPILE) @ndbcluster_includes@ $(CXXFLAGS) -c $< - # For testing of udf_example.so -noinst_LTLIBRARIES= udf_example.la udf_example_la_SOURCES= udf_example.c udf_example_la_LDFLAGS= -module -rpath $(pkglibdir) |