← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/include.am

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/include.am
4
4
 
5
5
CLIENT_LDADD= \
6
6
              drizzled/internal/libinternal.la \
7
 
              libdrizzle/libdrizzle.la \
 
7
              $(LIBDRIZZLE) \
8
8
              $(LIBINTL) \
9
9
              $(LIBZ) \
 
10
              gnulib/libgnu.la \
10
11
              client/libgetpassword.la
11
12
 
12
13
noinst_LTLIBRARIES+= \
13
14
                     client/libgetpassword.la
14
15
 
15
16
noinst_PROGRAMS+= \
16
 
                  client/drizzletest
17
 
 
18
 
bin_PROGRAMS+= \
19
 
               client/drizzle \
20
 
               client/drizzleadmin \
21
 
               client/drizzledump \
22
 
               client/drizzleimport \
23
 
               client/drizzleslap
24
 
 
25
 
man_MANS+= \
26
 
           client/drizzle.1 \
27
 
           client/drizzled.8 \
28
 
           client/drizzleimport.1 \
29
 
           client/drizzleslap.1
 
17
                  client/drizzletest \
 
18
                  extra/my_print_defaults
 
19
 
 
20
bin_PROGRAMS= \
 
21
              client/drizzle \
 
22
              client/drizzledump \
 
23
              client/drizzleimport \
 
24
              client/drizzleslap
 
25
 
 
26
man_MANS= \
 
27
          client/drizzle.1 \
 
28
          client/drizzled.8 \
 
29
          client/drizzledump.1 \
 
30
          client/drizzleimport.1 \
 
31
          client/drizzleslap.1
30
32
 
31
33
client_libgetpassword_la_SOURCES= client/get_password.cc
32
34
 
33
35
noinst_HEADERS+= \
34
36
                 client/client_priv.h \
 
37
                 client/errname.h \
35
38
                 client/get_password.h \
36
39
                 client/linebuffer.h \
37
 
                 client/conclusions.h \
38
 
                 client/drizzledump_data.h \
39
 
                 client/drizzledump_drizzle.h \
40
 
                 client/drizzledump_mysql.h \
41
 
                 client/option_string.h \
42
 
                 client/statement.h \
43
 
                 client/stats.h \
44
 
                 client/thread_context.h \
45
 
                 client/wakeup.h
 
40
                 drizzled/configmake.h
 
41
 
46
42
 
47
43
client_drizzle_SOURCES=         client/drizzle.cc client/linebuffer.cc
48
 
client_drizzle_LDADD=           ${READLINE_LIBS} ${BOOST_LIBS} \
49
 
                                libdrizzle/libdrizzle.la \
50
 
                                $(LIBINTL) \
51
 
                                $(LIBZ) \
52
 
                                client/libgetpassword.la
53
 
 
54
 
client_drizzleadmin_CXXFLAGS=   ${AM_CXXFLAGS} -DDRIZZLE_ADMIN_TOOL
55
 
client_drizzleadmin_SOURCES=    client/drizzle.cc client/linebuffer.cc
56
 
client_drizzleadmin_LDADD=      ${READLINE_LIBS} ${BOOST_LIBS} \
57
 
                                libdrizzle/libdrizzle.la \
58
 
                                $(LIBINTL) \
59
 
                                $(LIBZ) \
60
 
                                client/libgetpassword.la
61
 
 
62
 
client_drizzledump_SOURCES= \
63
 
                            client/drizzledump.cc \
64
 
                            client/drizzledump_data.cc \
65
 
                            client/drizzledump_drizzle.cc \
66
 
                            client/drizzledump_mysql.cc
67
 
 
68
 
client_drizzledump_LDADD=       ${CLIENT_LDADD} ${BOOST_LIBS}
 
44
client_drizzle_LDADD=           ${CLIENT_LDADD} ${READLINE_LIBS}
 
45
 
 
46
client_drizzledump_SOURCES=     client/drizzledump.cc
 
47
client_drizzledump_LDADD=       ${CLIENT_LDADD}
69
48
 
70
49
client_drizzleimport_SOURCES=   client/drizzleimport.cc
71
 
client_drizzleimport_LDADD=     ${CLIENT_LDADD} ${BOOST_LIBS}
 
50
client_drizzleimport_LDADD=     ${CLIENT_LDADD}
72
51
 
73
52
client_drizzleslap_SOURCES=     client/drizzleslap.cc
74
 
client_drizzleslap_LDADD=       ${CLIENT_LDADD} ${BOOST_LIBS}
75
 
client_drizzleslap_CXXFLAGS=    ${AM_CXXFLAGS} ${BOOSTSKIP_WARNINGS}
 
53
client_drizzleslap_LDADD=       ${CLIENT_LDADD}
76
54
 
77
 
client_drizzletest_SOURCES=     client/drizzletest.cc
78
 
client_drizzletest_LDADD=       ${CLIENT_LDADD} ${BOOST_LIBS} ${LIBPCRE} 
79
 
 
 
55
client_drizzletest_SOURCES=     client/drizzletest.cc client/errname.cc
 
56
client_drizzletest_LDADD=       ${CLIENT_LDADD} ${LIBPCRE}
80
57