database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code 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
parent 711464a11d b0a6a8e137
commit ad0516d91e
21 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libmysql/Makefile.am
View File

@ -23,8 +23,8 @@
target = libmysqlclient.la
target_defs = -DUNDEF_THREADS_HACK -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@
LIBS = @CLIENT_LIBS@
INCLUDES = -I$(top_srcdir)/include $(openssl_includes) @ZLIB_INCLUDES@ \
-I$(top_builddir)/include
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
$(openssl_includes) @ZLIB_INCLUDES@
include $(srcdir)/Makefile.shared