← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/include.am

Merge Monty - Finishes the libdrizzle-2.0 transition in how we install stuff

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/include.am
19
19
 
20
20
CLIENT_LDADD= \
21
21
              drizzled/internal/libinternal.la \
22
 
              libdrizzle-2.0/libdrizzle/libdrizzle.la \
 
22
              libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la \
23
23
              $(LIBINTL) \
24
24
              $(LIBZ) \
25
25
              client/libgetpassword.la
63
63
client_drizzle_SOURCES=         client/drizzle.cc client/linebuffer.cc
64
64
client_drizzle_CXXFLAGS=        ${AM_CXXFLAGS} ${LIBDRIZZLE_CPPFLAGS}
65
65
client_drizzle_LDADD=           ${READLINE_LIBS} ${BOOST_LIBS} \
66
 
                                libdrizzle-2.0/libdrizzle/libdrizzle.la \
 
66
                                libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la \
67
67
                                $(LIBINTL) \
68
68
                                $(LIBZ) \
69
69
                                client/libgetpassword.la
71
71
client_drizzleadmin_CXXFLAGS=   ${AM_CXXFLAGS} ${LIBDRIZZLE_CPPFLAGS} -DDRIZZLE_ADMIN_TOOL
72
72
client_drizzleadmin_SOURCES=    client/drizzle.cc client/linebuffer.cc
73
73
client_drizzleadmin_LDADD=      ${READLINE_LIBS} ${BOOST_LIBS} \
74
 
                                libdrizzle-2.0/libdrizzle/libdrizzle.la \
 
74
                                libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la \
75
75
                                $(LIBINTL) \
76
76
                                $(LIBZ) \
77
77
                                client/libgetpassword.la