diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-09-26 18:49:09 +0200 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-09-26 18:49:09 +0200 |
| commit | d8352a39eef7f35b705ab2a9a8a089e93e66fc02 (patch) | |
| tree | 021b1b7b7aa7d79d72c895364c29f3234605d7b0 /libmysql_r/Makefile.am | |
| parent | 9a640f848e465f2bebd27072fa651a230e9632f9 (diff) | |
| parent | fb5f16f9924047f2e4afaa4f571018c78eaa7e07 (diff) | |
| download | mariadb-git-d8352a39eef7f35b705ab2a9a8a089e93e66fc02.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into mysql.com:/home/kent/bk/make-dist-stable/mysql-5.1-build
configure.in:
Auto merged
mysql-test/Makefile.am:
Auto merged
Diffstat (limited to 'libmysql_r/Makefile.am')
| -rw-r--r-- | libmysql_r/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am index a8014b37bed..1d5e44f1cdb 100644 --- a/libmysql_r/Makefile.am +++ b/libmysql_r/Makefile.am @@ -29,11 +29,10 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ ## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include include $(top_srcdir)/libmysql/Makefile.shared -libmysqlclient_r_la_SOURCES = $(target_sources) +no_dist_libmysqlclient_r_la_SOURCES = $(target_sources) libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_las) libmysqlclient_r_la_LDFLAGS = $(target_ldflags) -# This is called from the toplevel makefile link_sources: set -x; \ for d in $(top_srcdir)/libmysql $(top_builddir)/libmysql; do \ |