← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle-2.0/include.am

  • Committer: Mark Atwood
  • Date: 2011-11-30 07:06:47 UTC
  • mfrom: (2463.1.6 drizzle-include)
  • Revision ID: me@mark.atwood.name-20111130070647-ixp7oalp70hkbt6l
merge lp:~brianaker/drizzle/libdrizzle-2.0-not-install

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle-2.0/include.am
34
34
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35
35
#
36
36
 
37
 
lib_LTLIBRARIES+= libdrizzle-2.0/libdrizzle-2.0.la
 
37
noinst_LTLIBRARIES+= libdrizzle-2.0/libdrizzle-2.0.la
38
38
 
39
39
if HAVE_LIBSQLITE3
40
40
SQLITE_PROGS= examples/sqlite_server
48
48
# to call it drizzle_password_hash but to remain backward compatible I didn't
49
49
# change any sources, rather just build it twice and provide both.
50
50
# Only drizzle_password_hash is installed by make install though.
51
 
bin_PROGRAMS+= libdrizzle-2.0/drizzle_password_hash
 
51
noinst_PROGRAMS+= libdrizzle-2.0/drizzle_password_hash
52
52
libdrizzle_2_0_drizzle_password_hash_LDADD= libdrizzle-2.0/libdrizzle-2.0.la
53
53
libdrizzle_2_0_drizzle_password_hash_SOURCES= libdrizzle-2.0/mysql_password_hash.cc
54
54
 
55
55
noinst_PROGRAMS+= \
 
56
                  $(SQLITE_PROGS) \
56
57
                  examples/client \
 
58
                  examples/pipe_query \
 
59
                  examples/proxy \
 
60
                  examples/server \
57
61
                  examples/simple \
58
62
                  examples/simple_multi \
59
 
                  examples/pipe_query \
60
 
                  examples/server \
61
 
                  examples/proxy \
62
 
                  $(SQLITE_PROGS)
 
63
                  libdrizzle-2.0/mysql_password_hash
63
64
 
64
65
libdrizzle_2_0_libdrizzle_2_0_la_CXXFLAGS= \
65
66
                                           ${AM_CXXFLAGS} \
111
112
examples_sqlite_server_SOURCES= examples/sqlite_server.cc
112
113
endif
113
114
 
114
 
nobase_include_HEADERS+= \
115
 
                         libdrizzle-2.0/column.h \
116
 
                         libdrizzle-2.0/column_client.h \
117
 
                         libdrizzle-2.0/column_server.h \
118
 
                         libdrizzle-2.0/command_client.h \
119
 
                         libdrizzle-2.0/command_server.h \
120
 
                         libdrizzle-2.0/conn.h \
121
 
                         libdrizzle-2.0/conn_client.h \
122
 
                         libdrizzle-2.0/conn_server.h \
123
 
                         libdrizzle-2.0/constants.h \
124
 
                         libdrizzle-2.0/drizzle.h \
125
 
                         libdrizzle-2.0/drizzle_client.h \
126
 
                         libdrizzle-2.0/drizzle_server.h \
127
 
                         libdrizzle-2.0/field_client.h \
128
 
                         libdrizzle-2.0/field_server.h \
129
 
                         libdrizzle-2.0/handshake_client.h \
130
 
                         libdrizzle-2.0/handshake_server.h \
131
 
                         libdrizzle-2.0/libdrizzle.h \
132
 
                         libdrizzle-2.0/libdrizzle.hpp \
133
 
                         libdrizzle-2.0/query.h \
134
 
                         libdrizzle-2.0/result.h \
135
 
                         libdrizzle-2.0/result_client.h \
136
 
                         libdrizzle-2.0/result_server.h \
137
 
                         libdrizzle-2.0/row_client.h \
138
 
                         libdrizzle-2.0/row_server.h \
139
 
                         libdrizzle-2.0/structs.h \
140
 
                         libdrizzle-2.0/visibility.h
141
 
 
142
115
noinst_HEADERS+= \
 
116
                 libdrizzle-2.0/column.h \
 
117
                 libdrizzle-2.0/column_client.h \
 
118
                 libdrizzle-2.0/column_server.h \
 
119
                 libdrizzle-2.0/command.h \
 
120
                 libdrizzle-2.0/command_client.h \
 
121
                 libdrizzle-2.0/command_server.h \
143
122
                 libdrizzle-2.0/common.h \
 
123
                 libdrizzle-2.0/conn.h \
 
124
                 libdrizzle-2.0/conn_client.h \
 
125
                 libdrizzle-2.0/conn_local.h \
 
126
                 libdrizzle-2.0/conn_server.h \
 
127
                 libdrizzle-2.0/constants.h \
 
128
                 libdrizzle-2.0/deprecated_enum.h \
 
129
                 libdrizzle-2.0/drizzle.h \
 
130
                 libdrizzle-2.0/drizzle_client.h \
144
131
                 libdrizzle-2.0/drizzle_local.h \
145
 
                 libdrizzle-2.0/conn_local.h \
 
132
                 libdrizzle-2.0/drizzle_server.h \
 
133
                 libdrizzle-2.0/field_client.h \
 
134
                 libdrizzle-2.0/field_server.h \
 
135
                 libdrizzle-2.0/handshake_client.h \
 
136
                 libdrizzle-2.0/handshake_server.h \
 
137
                 libdrizzle-2.0/libdrizzle.h \
 
138
                 libdrizzle-2.0/libdrizzle.hpp \
 
139
                 libdrizzle-2.0/limits.h \
146
140
                 libdrizzle-2.0/pack.h \
 
141
                 libdrizzle-2.0/query.h \
 
142
                 libdrizzle-2.0/result.h \
 
143
                 libdrizzle-2.0/result_client.h \
 
144
                 libdrizzle-2.0/result_server.h \
 
145
                 libdrizzle-2.0/return.h \
 
146
                 libdrizzle-2.0/row_client.h \
 
147
                 libdrizzle-2.0/row_server.h \
 
148
                 libdrizzle-2.0/sha1.h \
147
149
                 libdrizzle-2.0/state.h \
148
 
                 libdrizzle-2.0/sha1.h
 
150
                 libdrizzle-2.0/structs.h \
 
151
                 libdrizzle-2.0/verbose.h \
 
152
                 libdrizzle-2.0/visibility.h