← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/include.am

  • Committer: Mark Atwood
  • Date: 2011-08-12 04:08:33 UTC
  • mfrom: (2385.2.17 refactor5)
  • Revision ID: me@mark.atwood.name-20110812040833-u6j85nc6ahuc0dtz
merge lp:~olafvdspek/drizzle/refactor5

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/include.am
19
19
 
20
20
CLIENT_LDADD= \
21
21
              drizzled/internal/libinternal.la \
22
 
              libdrizzle/libdrizzle.la \
 
22
              libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la \
23
23
              $(LIBINTL) \
24
24
              $(LIBZ) \
25
25
              client/libgetpassword.la
32
32
 
33
33
bin_PROGRAMS+= \
34
34
               client/drizzle \
35
 
               client/drizzleadmin \
36
35
               client/drizzledump \
37
36
               client/drizzleimport \
38
37
               client/drizzleslap
54
53
                 client/drizzledump_drizzle.h \
55
54
                 client/drizzledump_mysql.h \
56
55
                 client/option_string.h \
 
56
                 client/server_detect.h \
57
57
                 client/statement.h \
58
58
                 client/stats.h \
59
59
                 client/thread_context.h \
 
60
                 client/user_detect.h \
60
61
                 client/wakeup.h
61
62
 
62
 
client_drizzle_SOURCES=         client/drizzle.cc client/linebuffer.cc
 
63
client_drizzle_SOURCES= \
 
64
                        client/drizzle.cc \
 
65
                        client/linebuffer.cc \
 
66
                        client/server_detect.cc
 
67
client_drizzle_CXXFLAGS=        ${AM_CXXFLAGS} ${LIBDRIZZLE_CPPFLAGS}
63
68
client_drizzle_LDADD=           ${READLINE_LIBS} ${BOOST_LIBS} \
64
 
                                libdrizzle/libdrizzle.la \
 
69
                                libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la \
65
70
                                $(LIBINTL) \
66
71
                                $(LIBZ) \
67
72
                                client/libgetpassword.la
68
73
 
69
 
client_drizzleadmin_CXXFLAGS=   ${AM_CXXFLAGS} -DDRIZZLE_ADMIN_TOOL
70
 
client_drizzleadmin_SOURCES=    client/drizzle.cc client/linebuffer.cc
71
 
client_drizzleadmin_LDADD=      ${READLINE_LIBS} ${BOOST_LIBS} \
72
 
                                libdrizzle/libdrizzle.la \
73
 
                                $(LIBINTL) \
74
 
                                $(LIBZ) \
75
 
                                client/libgetpassword.la
76
 
 
 
74
client_drizzledump_CXXFLAGS=    ${AM_CXXFLAGS} ${LIBDRIZZLE_CPPFLAGS}
77
75
client_drizzledump_SOURCES= \
78
76
                            client/drizzledump.cc \
79
77
                            client/drizzledump_data.cc \
80
78
                            client/drizzledump_drizzle.cc \
81
 
                            client/drizzledump_mysql.cc
 
79
                            client/drizzledump_mysql.cc \
 
80
                            client/server_detect.cc
82
81
 
83
82
client_drizzledump_LDADD=       ${CLIENT_LDADD} ${BOOST_LIBS}
84
83
 
85
84
client_drizzleimport_SOURCES=   client/drizzleimport.cc
 
85
client_drizzleimport_CXXFLAGS=  ${AM_CXXFLAGS} ${LIBDRIZZLE_CPPFLAGS}
86
86
client_drizzleimport_LDADD=     ${CLIENT_LDADD} ${BOOST_LIBS}
87
87
 
88
88
client_drizzleslap_SOURCES=     client/drizzleslap.cc
89
89
client_drizzleslap_LDADD=       ${CLIENT_LDADD} ${BOOST_LIBS}
90
 
client_drizzleslap_CXXFLAGS=    ${AM_CXXFLAGS} ${BOOSTSKIP_WARNINGS}
 
90
client_drizzleslap_CXXFLAGS=    ${AM_CXXFLAGS} ${BOOSTSKIP_WARNINGS} ${LIBDRIZZLE_CPPFLAGS}
91
91
 
92
92
client_drizzletest_SOURCES=     client/drizzletest.cc
93
93
client_drizzletest_LDADD=       ${CLIENT_LDADD} ${BOOST_LIBS} ${LIBPCRE} 
 
94
client_drizzletest_CXXFLAGS=    ${AM_CXXFLAGS} ${LIBDRIZZLE_CPPFLAGS}
94
95
 
95
96