← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/include.am

Merge in security refactor.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/include.am
2
2
# included from Top Level Makefile.am
3
3
# All paths should be given relative to the root
4
4
 
5
 
#  Copyright (C) 2008 Sun Microsystems, Inc.
6
 
#
7
 
#  This program is free software; you can redistribute it and/or modify
8
 
#  it under the terms of the GNU General Public License as published by
9
 
#  the Free Software Foundation; version 2 of the License.
10
 
#
11
 
#  This program is distributed in the hope that it will be useful,
12
 
#  but WITHOUT ANY WARRANTY; without even the implied warranty of
13
 
#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
 
#  GNU General Public License for more details.
15
 
#
16
 
#  You should have received a copy of the GNU General Public License
17
 
#  along with this program; if not, write to the Free Software
18
 
#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
 
 
20
5
CLIENT_LDADD= \
21
6
              drizzled/internal/libinternal.la \
22
 
              libdrizzle/libdrizzle.la \
 
7
              $(LIBDRIZZLE) \
23
8
              $(LIBINTL) \
24
9
              $(LIBZ) \
 
10
              gnulib/libgnu.la \
25
11
              client/libgetpassword.la
26
12
 
27
13
noinst_LTLIBRARIES+= \
28
14
                     client/libgetpassword.la
29
15
 
30
16
noinst_PROGRAMS+= \
31
 
                  client/drizzletest
32
 
 
33
 
bin_PROGRAMS+= \
34
 
               client/drizzle \
35
 
               client/drizzleadmin \
36
 
               client/drizzledump \
37
 
               client/drizzleimport \
38
 
               client/drizzleslap
39
 
 
40
 
man_MANS+= \
41
 
           client/drizzle.1 \
42
 
           client/drizzled.8 \
43
 
           client/drizzleimport.1 \
44
 
           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
45
32
 
46
33
client_libgetpassword_la_SOURCES= client/get_password.cc
47
34
 
48
35
noinst_HEADERS+= \
49
36
                 client/client_priv.h \
 
37
                 client/errname.h \
50
38
                 client/get_password.h \
51
39
                 client/linebuffer.h \
52
 
                 client/conclusions.h \
53
 
                 client/drizzledump_data.h \
54
 
                 client/drizzledump_drizzle.h \
55
 
                 client/drizzledump_mysql.h \
56
 
                 client/option_string.h \
57
 
                 client/statement.h \
58
 
                 client/stats.h \
59
 
                 client/thread_context.h \
60
 
                 client/wakeup.h
 
40
                 drizzled/configmake.h
 
41
 
61
42
 
62
43
client_drizzle_SOURCES=         client/drizzle.cc client/linebuffer.cc
63
 
client_drizzle_LDADD=           ${READLINE_LIBS} ${BOOST_LIBS} \
64
 
                                libdrizzle/libdrizzle.la \
65
 
                                $(LIBINTL) \
66
 
                                $(LIBZ) \
67
 
                                client/libgetpassword.la
68
 
 
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
 
 
77
 
client_drizzledump_SOURCES= \
78
 
                            client/drizzledump.cc \
79
 
                            client/drizzledump_data.cc \
80
 
                            client/drizzledump_drizzle.cc \
81
 
                            client/drizzledump_mysql.cc
82
 
 
83
 
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}
84
48
 
85
49
client_drizzleimport_SOURCES=   client/drizzleimport.cc
86
 
client_drizzleimport_LDADD=     ${CLIENT_LDADD} ${BOOST_LIBS}
 
50
client_drizzleimport_LDADD=     ${CLIENT_LDADD}
87
51
 
88
52
client_drizzleslap_SOURCES=     client/drizzleslap.cc
89
 
client_drizzleslap_LDADD=       ${CLIENT_LDADD} ${BOOST_LIBS}
90
 
client_drizzleslap_CXXFLAGS=    ${AM_CXXFLAGS} ${BOOSTSKIP_WARNINGS}
 
53
client_drizzleslap_LDADD=       ${CLIENT_LDADD}
91
54
 
92
 
client_drizzletest_SOURCES=     client/drizzletest.cc
93
 
client_drizzletest_LDADD=       ${CLIENT_LDADD} ${BOOST_LIBS} ${LIBPCRE} 
94
 
 
 
55
client_drizzletest_SOURCES=     client/drizzletest.cc client/errname.cc
 
56
client_drizzletest_LDADD=       ${CLIENT_LDADD} ${LIBPCRE}
95
57