← 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: 2011-03-23 18:58:39 UTC
  • mfrom: (2246.1.3 build)
  • Revision ID: kalebral@gmail.com-20110323185839-u96hq6u213nexixv
Merge Patrick - Updated dbqp's ld_lib_paths to find the new libdrizzle locations
Merge Monty - Splits out libdrizzle-1.0 and libdrizzle-2.0.

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/libdrizzle.la \
 
22
              libdrizzle-2.0/libdrizzle/libdrizzle.la \
23
23
              $(LIBINTL) \
24
24
              $(LIBZ) \
25
25
              client/libgetpassword.la
61
61
                 client/wakeup.h
62
62
 
63
63
client_drizzle_SOURCES=         client/drizzle.cc client/linebuffer.cc
 
64
client_drizzle_CXXFLAGS=        ${AM_CXXFLAGS} ${LIBDRIZZLE_CPPFLAGS}
64
65
client_drizzle_LDADD=           ${READLINE_LIBS} ${BOOST_LIBS} \
65
 
                                libdrizzle/libdrizzle.la \
 
66
                                libdrizzle-2.0/libdrizzle/libdrizzle.la \
66
67
                                $(LIBINTL) \
67
68
                                $(LIBZ) \
68
69
                                client/libgetpassword.la
69
70
 
70
 
client_drizzleadmin_CXXFLAGS=   ${AM_CXXFLAGS} -DDRIZZLE_ADMIN_TOOL
 
71
client_drizzleadmin_CXXFLAGS=   ${AM_CXXFLAGS} ${LIBDRIZZLE_CPPFLAGS} -DDRIZZLE_ADMIN_TOOL
71
72
client_drizzleadmin_SOURCES=    client/drizzle.cc client/linebuffer.cc
72
73
client_drizzleadmin_LDADD=      ${READLINE_LIBS} ${BOOST_LIBS} \
73
 
                                libdrizzle/libdrizzle.la \
 
74
                                libdrizzle-2.0/libdrizzle/libdrizzle.la \
74
75
                                $(LIBINTL) \
75
76
                                $(LIBZ) \
76
77
                                client/libgetpassword.la
77
78
 
 
79
client_drizzledump_CXXFLAGS=    ${AM_CXXFLAGS} ${LIBDRIZZLE_CPPFLAGS}
78
80
client_drizzledump_SOURCES= \
79
81
                            client/drizzledump.cc \
80
82
                            client/drizzledump_data.cc \
84
86
client_drizzledump_LDADD=       ${CLIENT_LDADD} ${BOOST_LIBS}
85
87
 
86
88
client_drizzleimport_SOURCES=   client/drizzleimport.cc
 
89
client_drizzleimport_CXXFLAGS=  ${AM_CXXFLAGS} ${LIBDRIZZLE_CPPFLAGS}
87
90
client_drizzleimport_LDADD=     ${CLIENT_LDADD} ${BOOST_LIBS}
88
91
 
89
92
client_drizzleslap_SOURCES=     client/drizzleslap.cc
90
93
client_drizzleslap_LDADD=       ${CLIENT_LDADD} ${BOOST_LIBS}
91
 
client_drizzleslap_CXXFLAGS=    ${AM_CXXFLAGS} ${BOOSTSKIP_WARNINGS}
 
94
client_drizzleslap_CXXFLAGS=    ${AM_CXXFLAGS} ${BOOSTSKIP_WARNINGS} ${LIBDRIZZLE_CPPFLAGS}
92
95
 
93
96
client_drizzletest_SOURCES=     client/drizzletest.cc
94
97
client_drizzletest_LDADD=       ${CLIENT_LDADD} ${BOOST_LIBS} ${LIBPCRE} 
 
98
client_drizzletest_CXXFLAGS=    ${AM_CXXFLAGS} ${LIBDRIZZLE_CPPFLAGS}
95
99
 
96
100