diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-13 17:51:33 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-13 17:51:33 +0100 |
| commit | b727e09ce3e60aa8f84522d843e742dba9181421 (patch) | |
| tree | 58e236569f48af300a120a27300eec84f4e7f2d1 /client | |
| parent | ab15fb9e9080d21bb84a8e8ceb8d86129c669972 (diff) | |
| parent | 1ad359efc2a37677213e0f478ed6c9e6a3ec45f9 (diff) | |
| download | mariadb-git-b727e09ce3e60aa8f84522d843e742dba9181421.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/bug19817/my50-bug19817
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to 'client')
| -rw-r--r-- | client/Makefile.am | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index 29624f2017f..df6e38223d4 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -16,11 +16,6 @@ # This file is public domain and comes with NO WARRANTY of any kind -if HAVE_YASSL - yassl_dummy_link_fix= $(top_srcdir)/extra/yassl/src/dummy.cpp -else - yassl_dummy_link_fix= -endif #AUTOMAKE_OPTIONS = nostdinc INCLUDES = -I$(top_builddir)/include \ -I$(top_srcdir)/include \ @@ -40,27 +35,28 @@ mysqladmin_SOURCES = mysqladmin.cc mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS) mysqltest_SOURCES= mysqltest.c \ $(top_srcdir)/mysys/my_getsystime.c \ - $(top_srcdir)/mysys/my_copy.c \ - $(yassl_dummy_link_fix) + $(top_srcdir)/mysys/my_copy.c + mysqltest_LDADD = $(top_builddir)/regex/libregex.a $(LDADD) -mysqlbinlog_SOURCES = mysqlbinlog.cc $(top_srcdir)/mysys/mf_tempdir.c $(top_srcdir)/mysys/my_new.cc +mysqlbinlog_SOURCES = mysqlbinlog.cc \ + $(top_srcdir)/mysys/mf_tempdir.c \ + $(top_srcdir)/mysys/my_new.cc mysqlbinlog_LDADD = $(LDADD) $(CXXLDFLAGS) -mysqltestmanager_pwgen_SOURCES = mysqlmanager-pwgen.c -mysqltestmanagerc_SOURCES= mysqlmanagerc.c $(yassl_dummy_link_fix) -mysqlcheck_SOURCES= mysqlcheck.c $(yassl_dummy_link_fix) -mysqlshow_SOURCES= mysqlshow.c $(yassl_dummy_link_fix) +mysqltestmanager_pwgen_SOURCES = mysqlmanager-pwgen.c +mysqltestmanagerc_SOURCES= mysqlmanagerc.c +mysqlcheck_SOURCES= mysqlcheck.c +mysqlshow_SOURCES= mysqlshow.c mysqldump_SOURCES= mysqldump.c my_user.c \ - $(top_srcdir)/mysys/mf_getdate.c \ - $(yassl_dummy_link_fix) -mysqlimport_SOURCES= mysqlimport.c $(yassl_dummy_link_fix) -mysql_upgrade_SOURCES= mysql_upgrade.c $(yassl_dummy_link_fix) + $(top_srcdir)/mysys/mf_getdate.c +mysqlimport_SOURCES= mysqlimport.c +mysql_upgrade_SOURCES= mysql_upgrade.c sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc strings_src=decimal.c # Fix for mit-threads DEFS = -DUNDEF_THREADS_HACK \ -DDEFAULT_MYSQL_HOME="\"$(prefix)\"" \ - -DDATADIR="\"$(localstatedir)\"" + -DDATADIR="\"$(localstatedir)\"" EXTRA_DIST = get_password.c CMakeLists.txt |