diff options
| author | unknown <kostja@bodhi.(none)> | 2007-06-22 19:58:27 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-06-22 19:58:27 +0400 |
| commit | a50a88e29c53cc09a3c17d437609a7e9183cae45 (patch) | |
| tree | d0a0d38a6c9e42ec2bd881664361c1bcd086321f /sql/Makefile.am | |
| parent | 40315b491f6b2de4188d4a98b1f0b36325c9f4b0 (diff) | |
| download | mariadb-git-a50a88e29c53cc09a3c17d437609a7e9183cae45.tar.gz | |
Fix broken automatic dependency tracking of Automake in sql/:
The embedded library is still broken, but there the situation
with dependencies is even more broken.
sql/Makefile.am:
Fix broken automatic dependency tracking of Automake in sql/:
use a convenience library to specify additional includes that
are required to compile files ha_ndbcluster_*, and then
add this convenience library to the main project.
The embedded library is still broken, but there the situation
with dependencies is even more broken.
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 fdf3f88c1f8..12d8c8206b2 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@ \ @@ -93,8 +98,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 \ @@ -114,6 +118,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@ @@ -157,22 +166,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) |