← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/include.am

  • Committer: Lee Bieber
  • Date: 2010-10-27 18:28:56 UTC
  • mfrom: (1883.1.3 build)
  • Revision ID: kalebral@gmail.com-20101027182856-q3wqtbv1t4egkjsk
Merge Andrew - fix bug 667360: --defaults-file not processed before paths read           
Merge Andrew - fix bug 656577: Importing SQL script results in silent failure    
Merge Andrew - fix bug 667053: drizzledump minor output cleanup needed

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
7
              libdrizzle/libdrizzle.la \
32
17
 
33
18
bin_PROGRAMS+= \
34
19
               client/drizzle \
35
 
               client/drizzleadmin \
36
20
               client/drizzledump \
37
21
               client/drizzleimport \
38
22
               client/drizzleslap
47
31
 
48
32
noinst_HEADERS+= \
49
33
                 client/client_priv.h \
 
34
                 client/errname.h \
50
35
                 client/get_password.h \
51
36
                 client/linebuffer.h \
52
 
                 client/conclusions.h \
53
37
                 client/drizzledump_data.h \
 
38
                 client/drizzledump_mysql.h \
54
39
                 client/drizzledump_drizzle.h \
55
 
                 client/drizzledump_mysql.h \
 
40
                 client/statement.h \
56
41
                 client/option_string.h \
57
 
                 client/statement.h \
58
42
                 client/stats.h \
59
43
                 client/thread_context.h \
60
 
                 client/wakeup.h
 
44
                 client/conclusions.h
61
45
 
62
46
client_drizzle_SOURCES=         client/drizzle.cc client/linebuffer.cc
63
47
client_drizzle_LDADD=           ${READLINE_LIBS} ${BOOST_LIBS} \
66
50
                                $(LIBZ) \
67
51
                                client/libgetpassword.la
68
52
 
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
 
 
 
53
client_drizzledump_SOURCES=     client/drizzledump.cc \
 
54
                                client/drizzledump_data.cc \
 
55
                                client/drizzledump_mysql.cc \
 
56
                                client/drizzledump_drizzle.cc
83
57
client_drizzledump_LDADD=       ${CLIENT_LDADD} ${BOOST_LIBS}
84
58
 
85
59
client_drizzleimport_SOURCES=   client/drizzleimport.cc
89
63
client_drizzleslap_LDADD=       ${CLIENT_LDADD} ${BOOST_LIBS}
90
64
client_drizzleslap_CXXFLAGS=    ${AM_CXXFLAGS} ${BOOSTSKIP_WARNINGS}
91
65
 
92
 
client_drizzletest_SOURCES=     client/drizzletest.cc
 
66
client_drizzletest_SOURCES=     client/drizzletest.cc client/errname.cc
93
67
client_drizzletest_LDADD=       ${CLIENT_LDADD} ${BOOST_LIBS} ${LIBPCRE} 
94
68
 
95
69