← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/Makefile.am

  • Committer: Monty Taylor
  • Date: 2008-07-12 14:43:50 UTC
  • mto: (77.6.1 glibclient-merge)
  • mto: This revision was merged to the branch mainline in revision 176.
  • Revision ID: monty@inaugust.com-20080712144350-g1r05g8kciv5np0t
First steps in removing sql_string and using glib instead.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/Makefile.am
24
24
LDADD=                          $(top_builddir)/libdrizzle/libdrizzle.la -lz
25
25
 
26
26
 
27
 
noinst_HEADERS =                sql_string.h completion_hash.h my_readline.h \
 
27
noinst_HEADERS =                completion_hash.h my_readline.h \
28
28
                                client_priv.h
29
29
 
30
30
CLEANFILES =                    $(BUILT_SOURCES)
38
38
                                mysqltest \
39
39
                                mysqlslap 
40
40
 
41
 
mysql_SOURCES =                 mysql.cc readline.cc sql_string.cc \
 
41
mysql_SOURCES =                 mysql.cc readline.cc \
42
42
                                completion_hash.cc
43
 
mysql_LDADD =                   -lreadline @TERMCAP_LIB@ \
 
43
mysql_LDADD =                   -lreadline @TERMCAP_LIB@ $(GLIB_LIBS) \
44
44
                                $(LDADD) $(CXXLDFLAGS)
 
45
mysql_CPPFLAGS =                $(AM_CPPFLAGS) $(GLIB_CFLAGS)
45
46
mysqladmin_SOURCES =            mysqladmin.cc
46
47
 
47
48
mysqlbinlog_SOURCES =           mysqlbinlog.cc \
52
53
                                $(top_srcdir)/mysys/base64.c 
53
54
mysqlbinlog_LDADD =             $(LDADD) $(CXXLDFLAGS) 
54
55
 
55
 
mysqldump_SOURCES=              mysqldump.c \
56
 
                                $(top_srcdir)/mysys/mf_getdate.c
 
56
mysqldump_SOURCES=              mysqldump.c 
57
57
 
58
58
mysqlimport_SOURCES=            mysqlimport.c
59
59
 
60
60
mysqlslap_SOURCES=              mysqlslap.c
61
61
mysqlslap_CFLAGS=               -DTHREAD -UUNDEF_THREADS_HACK
62
62
 
63
 
mysqltest_SOURCES=              mysqltest.cc \
64
 
                                $(top_srcdir)/mysys/my_getsystime.c \
65
 
                                $(top_srcdir)/mysys/my_copy.c \
66
 
                                $(top_srcdir)/mysys/my_mkdir.c
 
63
mysqltest_SOURCES=              mysqltest.cc 
67
64
mysqltest_LDADD =               ${LDADD} @PCRE_LIBS@
68
65
mysqltest_CFLAGS =              ${AM_CPPFLAGS} @PCRE_CFLAGS@
69
66