← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/Makefile.am

  • Committer: Stewart Smith
  • Date: 2008-06-30 06:25:49 UTC
  • mfrom: (12.3.1 drizzle-stew)
  • mto: This revision was merged to the branch mainline in revision 19.
  • Revision ID: stewart@flamingspork.com-20080630062549-js2qnn332yz28dp8
remove non-thread safe client library. client lib is now *always* thread safe.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/Makefile.am
15
15
 
16
16
# This file is public domain and comes with NO WARRANTY of any kind
17
17
 
18
 
if THREAD_SAFE_CLIENT
19
 
LIBMYSQLCLIENT_LA =             $(top_builddir)/libmysql_r/libmysqlclient_r.la
20
 
else
21
18
LIBMYSQLCLIENT_LA =             $(top_builddir)/libmysql/libmysqlclient.la
22
 
endif
23
19
 
24
20
INCLUDES =                      -I$(top_builddir)/include \
25
21
                                -I$(top_srcdir)/include \
28
24
LIBS =                          @CLIENT_LIBS@ -lz
29
25
 
30
26
LDADD=                          @CLIENT_EXTRA_LDFLAGS@ $(CLIENT_THREAD_LIBS) \
31
 
                                $(top_builddir)/libmysql/libmysqlclient.la -lz
 
27
                                $(top_builddir)/libmysql/libmysqlclient.la -lz \
 
28
                                $(top_builddir)/mysys/libmysys.a
 
29
 
32
30
 
33
31
noinst_HEADERS =                sql_string.h completion_hash.h my_readline.h \
34
32
                                client_priv.h