mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge

Browse source 
BitKeeper/deleted/.del-Makefile.am~6cfa0db5e7778d09:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~41238af048e60515:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
netware/Makefile.am:
  Auto merged
tests/Makefile.am:
  Auto merged
vio/Makefile.am:
  SCCS merged
This commit is contained in:
unknown 2005-07-06 00:06:11 +02:00
commit ad0516d91e
21 changed files with 37 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/Makefile.am
View file

@ -22,8 +22,8 @@ else
yassl_dummy_link_fix=
endif
#AUTOMAKE_OPTIONS = nostdinc
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/regex \
$(openssl_includes) -I$(top_builddir)/include
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(top_srcdir)/regex $(openssl_includes)
LIBS = @CLIENT_LIBS@
LDADD= @CLIENT_EXTRA_LDFLAGS@ \
$(top_builddir)/libmysql/libmysqlclient.la