diff options
| author | cmiller@zippy.cornsilk.net <> | 2007-10-17 14:05:43 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2007-10-17 14:05:43 -0400 |
| commit | f3d77c1979bad93a304cbb5b93d672178815df00 (patch) | |
| tree | 892096ddfa11f5fea89ad26528d5c64fbc05ffce /libmysqld/Makefile.am | |
| parent | c6b5c6af86cb7fed9ad86690136d668071b6f6cc (diff) | |
| parent | 571200d48750beba84a2936d727afcb347e1b704 (diff) | |
| download | mariadb-git-f3d77c1979bad93a304cbb5b93d672178815df00.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-comeng-unification
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-recentcommmerge
Diffstat (limited to 'libmysqld/Makefile.am')
| -rw-r--r-- | libmysqld/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 1b3207bac17..5d673bb340e 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -22,7 +22,7 @@ MYSQLSHAREdir = $(pkgdatadir) MYSQLBASEdir= $(prefix) MYSQLLIBdir= $(libdir) -EXTRA_DIST = libmysqld.def +EXTRA_DIST = libmysqld.def CMakeLists.txt DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \ -DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \ -DDATADIR="\"$(MYSQLDATAdir)\"" \ @@ -79,7 +79,8 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ rpl_injector.cc my_user.c partition_info.cc \ sql_servers.cc -libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) +libmysqld_int_a_SOURCES= $(libmysqld_sources) +nodist_libmysqld_int_a_SOURCES= $(libmysqlsources) $(sqlsources) libmysqld_a_SOURCES= sqlstoragesources = $(EXTRA_libmysqld_a_SOURCES) @@ -96,6 +97,7 @@ INC_LIB= $(top_builddir)/regex/libregex.a \ $(top_builddir)/strings/libmystrings.a \ $(top_builddir)/dbug/libdbug.a \ $(top_builddir)/vio/libvio.a \ + @NDB_SCI_LIBS@ \ @mysql_plugin_libs@ \ $(yassl_inc_libs) |