diff options
| author | unknown <msvensson@shellback.(none)> | 2006-05-31 16:32:08 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-05-31 16:32:08 +0200 |
| commit | 0444d22f2decc5a0d920c7bea1b5ced036f8c332 (patch) | |
| tree | 43c75d8e6d8a5a60d0090df1d0bd6117d909a85e /client | |
| parent | 3ebe4455c2e7192ef68874a9f99f59d66cef2a1f (diff) | |
| parent | e03f47859fe2fdbe465613712448a65dcdfc03ac (diff) | |
| download | mariadb-git-0444d22f2decc5a0d920c7bea1b5ced036f8c332.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/bug19575/my50-bug19575
into shellback.(none):/home/msvensson/mysql/mysql-5.0
extra/yassl/include/openssl/ssl.h:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index 9d133125a0d..5787905fd35 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -25,7 +25,7 @@ endif INCLUDES = -I$(top_builddir)/include \ -I$(top_srcdir)/include \ -I$(top_srcdir)/regex \ - $(openssl_includes) $(yassl_includes) + $(openssl_includes) LIBS = @CLIENT_LIBS@ LDADD= @CLIENT_EXTRA_LDFLAGS@ \ $(top_builddir)/libmysql/libmysqlclient.la @@ -69,7 +69,7 @@ link_sources: done; \ rm -f $(srcdir)/my_user.c; \ @LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c; - + # Don't update the files from bitkeeper %::SCCS/s.% |