← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/include.am

  • Committer: Brian Aker
  • Date: 2011-11-04 21:06:16 UTC
  • mto: This revision was merged to the branch mainline in revision 2450.
  • Revision ID: brian@tangent.org-20111104210616-2at42agch94dkwb0
Additional fixes for libdrizzle.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/include.am
17
17
#  along with this program; if not, write to the Free Software
18
18
#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 
20
 
CLIENT2_LDADD= \
21
 
               drizzled/internal/libinternal.la \
22
 
               libdrizzle-2.0/libdrizzle-2.0.la \
23
 
               $(LIBINTL) \
24
 
               $(LIBZ) \
25
 
               client/libgetpassword.la
 
20
CLIENT_LDADD= \
 
21
              drizzled/internal/libinternal.la \
 
22
              libdrizzle-2.0/libdrizzle-2.0.la \
 
23
              $(LIBINTL) \
 
24
              $(LIBZ) \
 
25
              client/libgetpassword.la
26
26
 
27
27
noinst_LTLIBRARIES+= \
28
28
                     client/libgetpassword.la
64
64
                        client/drizzle.cc \
65
65
                        client/linebuffer.cc \
66
66
                        client/server_detect.cc
 
67
client_drizzle_CXXFLAGS=        ${AM_CXXFLAGS} ${LIBDRIZZLE_CPPFLAGS}
67
68
client_drizzle_LDADD=           ${READLINE_LIBS} ${BOOST_LIBS} \
68
69
                                libdrizzle-2.0/libdrizzle-2.0.la \
69
70
                                $(LIBINTL) \
70
71
                                $(LIBZ) \
71
72
                                client/libgetpassword.la
72
73
 
 
74
client_drizzledump_CXXFLAGS=    ${AM_CXXFLAGS} ${LIBDRIZZLE_CPPFLAGS}
73
75
client_drizzledump_SOURCES= \
74
76
                            client/drizzledump.cc \
75
77
                            client/drizzledump_data.cc \
77
79
                            client/drizzledump_mysql.cc \
78
80
                            client/server_detect.cc
79
81
 
80
 
client_drizzledump_LDADD=       ${CLIENT2_LDADD} ${BOOST_LIBS}
 
82
client_drizzledump_LDADD=       ${CLIENT_LDADD} ${BOOST_LIBS}
81
83
 
82
84
client_drizzleimport_SOURCES=   client/drizzleimport.cc
83
 
client_drizzleimport_LDADD=     ${CLIENT2_LDADD} ${BOOST_LIBS}
 
85
client_drizzleimport_CXXFLAGS=  ${AM_CXXFLAGS} ${LIBDRIZZLE_CPPFLAGS}
 
86
client_drizzleimport_LDADD=     ${CLIENT_LDADD} ${BOOST_LIBS}
84
87
 
85
88
client_drizzleslap_SOURCES=     client/drizzleslap.cc
86
 
client_drizzleslap_LDADD=       ${CLIENT2_LDADD} ${BOOST_LIBS}
87
 
client_drizzleslap_CXXFLAGS=    ${AM_CXXFLAGS} ${BOOSTSKIP_WARNINGS}
 
89
client_drizzleslap_LDADD=       ${CLIENT_LDADD} ${BOOST_LIBS}
 
90
client_drizzleslap_CXXFLAGS=    ${AM_CXXFLAGS} ${BOOSTSKIP_WARNINGS} ${LIBDRIZZLE_CPPFLAGS}
88
91
 
89
92
client_drizzletest_SOURCES=     client/drizzletest.cc
90
 
client_drizzletest_LDADD=       ${CLIENT2_LDADD} ${BOOST_LIBS} ${LIBPCRE} 
 
93
client_drizzletest_LDADD=       ${CLIENT_LDADD} ${BOOST_LIBS} ${LIBPCRE} 
 
94
client_drizzletest_CXXFLAGS=    ${AM_CXXFLAGS} ${LIBDRIZZLE_CPPFLAGS}
 
95
 
 
96