← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/include.am

Fix merge issues with 1.0 CC fix.

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
 
CLIENT_LDADD= \
21
 
              drizzled/internal/libinternal.la \
22
 
              libdrizzle-2.0/libdrizzle-2.0.la \
23
 
              $(LIBINTL) \
24
 
              $(LIBZ) \
25
 
              client/libgetpassword.la
 
20
CLIENT2_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
77
77
                            client/drizzledump_mysql.cc \
78
78
                            client/server_detect.cc
79
79
 
80
 
client_drizzledump_LDADD=       ${CLIENT_LDADD} ${BOOST_LIBS}
 
80
client_drizzledump_LDADD=       ${CLIENT2_LDADD} ${BOOST_LIBS}
81
81
 
82
82
client_drizzleimport_SOURCES=   client/drizzleimport.cc
83
 
client_drizzleimport_LDADD=     ${CLIENT_LDADD} ${BOOST_LIBS}
 
83
client_drizzleimport_LDADD=     ${CLIENT2_LDADD} ${BOOST_LIBS}
84
84
 
85
85
client_drizzleslap_SOURCES=     client/drizzleslap.cc
86
 
client_drizzleslap_LDADD=       ${CLIENT_LDADD} ${BOOST_LIBS}
 
86
client_drizzleslap_LDADD=       ${CLIENT2_LDADD} ${BOOST_LIBS}
87
87
client_drizzleslap_CXXFLAGS=    ${AM_CXXFLAGS} ${BOOSTSKIP_WARNINGS}
88
88
 
89
89
client_drizzletest_SOURCES=     client/drizzletest.cc
90
 
client_drizzletest_LDADD=       ${CLIENT_LDADD} ${BOOST_LIBS} ${LIBPCRE} 
 
90
client_drizzletest_LDADD=       ${CLIENT2_LDADD} ${BOOST_LIBS} ${LIBPCRE}