← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle-2.0/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:
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/libdrizzle-2.0.la
 
37
lib_LTLIBRARIES+= libdrizzle-2.0/libdrizzle-2.0.la
38
38
 
39
39
if HAVE_LIBSQLITE3
40
40
SQLITE_PROGS= examples/sqlite_server
41
41
endif
42
42
 
43
 
noinst_PROGRAMS+= \
44
 
                  libdrizzle-2.0/libdrizzle/mysql_password_hash
45
 
libdrizzle_2_0_libdrizzle_mysql_password_hash_CXXFLAGS= ${AM_CXXFLAGS} ${LIBDRIZZLE_CPPFLAGS}
46
 
libdrizzle_2_0_libdrizzle_mysql_password_hash_LDADD= libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la
47
 
libdrizzle_2_0_libdrizzle_mysql_password_hash_SOURCES= libdrizzle-2.0/libdrizzle/mysql_password_hash.cc
 
43
noinst_PROGRAMS+= libdrizzle-2.0/mysql_password_hash
 
44
libdrizzle_2_0_mysql_password_hash_CXXFLAGS= ${AM_CXXFLAGS} ${LIBDRIZZLE_CPPFLAGS}
 
45
libdrizzle_2_0_mysql_password_hash_LDADD= libdrizzle-2.0/libdrizzle-2.0.la
 
46
libdrizzle_2_0_mysql_password_hash_SOURCES= libdrizzle-2.0/mysql_password_hash.cc
48
47
 
49
48
# For some reason this has originally been called mysql_password_hash. I'd prefer
50
49
# to call it drizzle_password_hash but to remain backward compatible I didn't
51
50
# change any sources, rather just build it twice and provide both.
52
51
# Only drizzle_password_hash is installed by make install though.
53
 
bin_PROGRAMS+= \
54
 
                  libdrizzle-2.0/libdrizzle/drizzle_password_hash
55
 
libdrizzle_2_0_libdrizzle_drizzle_password_hash_CXXFLAGS= ${AM_CXXFLAGS} ${LIBDRIZZLE_CPPFLAGS}
56
 
libdrizzle_2_0_libdrizzle_drizzle_password_hash_LDADD= libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la
57
 
libdrizzle_2_0_libdrizzle_drizzle_password_hash_SOURCES= libdrizzle-2.0/libdrizzle/mysql_password_hash.cc
 
52
bin_PROGRAMS+= libdrizzle-2.0/drizzle_password_hash
 
53
libdrizzle_2_0_drizzle_password_hash_CXXFLAGS= ${AM_CXXFLAGS} ${LIBDRIZZLE_CPPFLAGS}
 
54
libdrizzle_2_0_drizzle_password_hash_LDADD= libdrizzle-2.0/libdrizzle-2.0.la
 
55
libdrizzle_2_0_drizzle_password_hash_SOURCES= libdrizzle-2.0/mysql_password_hash.cc
58
56
 
59
57
noinst_PROGRAMS+= \
60
 
        examples/client \
61
 
        examples/simple \
62
 
        examples/simple_multi \
63
 
        examples/pipe_query \
64
 
        examples/server \
65
 
        examples/proxy \
66
 
        $(SQLITE_PROGS)
67
 
 
68
 
libdrizzle_2_0_libdrizzle_libdrizzle_2_0_la_CXXFLAGS= \
69
 
        ${AM_CXXFLAGS} \
70
 
        ${LIBDRIZZLE_CPPFLAGS} \
71
 
        ${CFLAG_VISIBILITY} \
72
 
        -DBUILDING_LIBDRIZZLE
73
 
 
74
 
libdrizzle_2_0_libdrizzle_libdrizzle_2_0_la_LDFLAGS= \
75
 
        $(AM_LDFLAGS) \
76
 
        $(GCOV_LIBS) \
77
 
        -version-info \
78
 
        $(LIBDRIZZLE_LIBRARY_VERSION)
79
 
 
80
 
libdrizzle_2_0_libdrizzle_libdrizzle_2_0_la_SOURCES= \
81
 
        libdrizzle-2.0/libdrizzle/column.cc \
82
 
        libdrizzle-2.0/libdrizzle/command.cc \
83
 
        libdrizzle-2.0/libdrizzle/conn.cc \
84
 
        libdrizzle-2.0/libdrizzle/conn_uds.cc \
85
 
        libdrizzle-2.0/libdrizzle/drizzle.cc \
86
 
        libdrizzle-2.0/libdrizzle/field.cc \
87
 
        libdrizzle-2.0/libdrizzle/handshake.cc \
88
 
        libdrizzle-2.0/libdrizzle/pack.cc \
89
 
        libdrizzle-2.0/libdrizzle/query.cc \
90
 
        libdrizzle-2.0/libdrizzle/result.cc \
91
 
        libdrizzle-2.0/libdrizzle/row.cc \
92
 
        libdrizzle-2.0/libdrizzle/sha1.cc \
93
 
        libdrizzle-2.0/libdrizzle/state.cc
 
58
                  examples/client \
 
59
                  examples/simple \
 
60
                  examples/simple_multi \
 
61
                  examples/pipe_query \
 
62
                  examples/server \
 
63
                  examples/proxy \
 
64
                  $(SQLITE_PROGS)
 
65
 
 
66
libdrizzle_2_0_libdrizzle_2_0_la_CXXFLAGS= \
 
67
                                           ${AM_CXXFLAGS} \
 
68
                                           ${LIBDRIZZLE_CPPFLAGS} \
 
69
                                           ${CFLAG_VISIBILITY} \
 
70
                                           -DBUILDING_LIBDRIZZLE
 
71
 
 
72
libdrizzle_2_0_libdrizzle_2_0_la_LDFLAGS= \
 
73
                                          $(AM_LDFLAGS) \
 
74
                                          $(GCOV_LIBS) \
 
75
                                          -version-info \
 
76
                                          $(LIBDRIZZLE_LIBRARY_VERSION)
 
77
 
 
78
libdrizzle_2_0_libdrizzle_2_0_la_SOURCES= \
 
79
                                          libdrizzle-2.0/column.cc \
 
80
                                          libdrizzle-2.0/command.cc \
 
81
                                          libdrizzle-2.0/conn.cc \
 
82
                                          libdrizzle-2.0/conn_uds.cc \
 
83
                                          libdrizzle-2.0/drizzle.cc \
 
84
                                          libdrizzle-2.0/field.cc \
 
85
                                          libdrizzle-2.0/handshake.cc \
 
86
                                          libdrizzle-2.0/pack.cc \
 
87
                                          libdrizzle-2.0/query.cc \
 
88
                                          libdrizzle-2.0/result.cc \
 
89
                                          libdrizzle-2.0/row.cc \
 
90
                                          libdrizzle-2.0/sha1.cc \
 
91
                                          libdrizzle-2.0/state.cc
94
92
 
95
93
examples_server_CXXFLAGS= \
96
 
                          $(AM_CXXFLAGS) \
97
 
                          ${LIBDRIZZLE_CPPFLAGS}
 
94
                          $(AM_CXXFLAGS) \
 
95
                          ${LIBDRIZZLE_CPPFLAGS}
98
96
examples_server_SOURCES= examples/server.cc
99
 
examples_server_LDADD= libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la
 
97
examples_server_LDADD= libdrizzle-2.0/libdrizzle-2.0.la
100
98
 
101
99
examples_proxy_CXXFLAGS= \
102
 
                         $(AM_CXXFLAGS) \
103
 
                         ${LIBDRIZZLE_CPPFLAGS}
 
100
                         $(AM_CXXFLAGS) \
 
101
                         ${LIBDRIZZLE_CPPFLAGS}
104
102
examples_proxy_SOURCES= examples/proxy.cc
105
 
examples_proxy_LDADD= libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la
 
103
examples_proxy_LDADD= libdrizzle-2.0/libdrizzle-2.0.la
106
104
 
107
105
examples_client_CXXFLAGS= \
108
 
                          $(AM_CXXFLAGS) \
109
 
                          ${LIBDRIZZLE_CPPFLAGS}
 
106
                          $(AM_CXXFLAGS) \
 
107
                          ${LIBDRIZZLE_CPPFLAGS}
110
108
examples_client_SOURCES= examples/client.cc
111
 
examples_client_LDADD= libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la
 
109
examples_client_LDADD= libdrizzle-2.0/libdrizzle-2.0.la
112
110
 
113
111
examples_simple_CXXFLAGS= \
114
 
                          $(AM_CXXFLAGS) \
115
 
                          ${LIBDRIZZLE_CPPFLAGS}
 
112
                          $(AM_CXXFLAGS) \
 
113
                          ${LIBDRIZZLE_CPPFLAGS}
116
114
examples_simple_SOURCES= examples/simple.cc
117
 
examples_simple_LDADD= libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la
 
115
examples_simple_LDADD= libdrizzle-2.0/libdrizzle-2.0.la
118
116
 
119
117
examples_simple_multi_CXXFLAGS= \
120
 
                                $(AM_CXXFLAGS) \
121
 
                                ${LIBDRIZZLE_CPPFLAGS}
 
118
                                $(AM_CXXFLAGS) \
 
119
                                ${LIBDRIZZLE_CPPFLAGS}
122
120
examples_simple_multi_SOURCES= examples/simple_multi.cc
123
 
examples_simple_multi_LDADD= libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la
 
121
examples_simple_multi_LDADD= libdrizzle-2.0/libdrizzle-2.0.la
124
122
 
125
123
examples_pipe_query_CXXFLAGS= \
126
 
                              $(AM_CXXFLAGS) \
127
 
                              ${LIBDRIZZLE_CPPFLAGS}
 
124
                              $(AM_CXXFLAGS) \
 
125
                              ${LIBDRIZZLE_CPPFLAGS}
128
126
examples_pipe_query_SOURCES= examples/pipe_query.cc
129
 
examples_pipe_query_LDADD= libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la
 
127
examples_pipe_query_LDADD= libdrizzle-2.0/libdrizzle-2.0.la
130
128
 
131
129
if HAVE_LIBSQLITE3
132
130
examples_sqlite_server_CXXFLAGS= \
133
 
                                 $(AM_CXXFLAGS) \
134
 
                                 ${LIBDRIZZLE_CPPFLAGS}
135
 
examples_sqlite_server_LDFLAGS= libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la $(LTLIBSQLITE3)
136
 
examples_sqlite_server_DEPENDENCIES= libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la
 
131
                                 $(AM_CXXFLAGS) \
 
132
                                 ${LIBDRIZZLE_CPPFLAGS}
 
133
examples_sqlite_server_LDFLAGS= libdrizzle-2.0/libdrizzle-2.0.la $(LTLIBSQLITE3)
 
134
examples_sqlite_server_DEPENDENCIES= libdrizzle-2.0/libdrizzle-2.0.la
137
135
examples_sqlite_server_SOURCES= examples/sqlite_server.cc
138
136
endif
139
137
 
140
138
dist_libdrizzleinstall_HEADERS= \
141
 
                                libdrizzle-2.0/libdrizzle/column.h \
142
 
                                libdrizzle-2.0/libdrizzle/column_client.h \
143
 
                                libdrizzle-2.0/libdrizzle/column_server.h \
144
 
                                libdrizzle-2.0/libdrizzle/command_client.h \
145
 
                                libdrizzle-2.0/libdrizzle/command_server.h \
146
 
                                libdrizzle-2.0/libdrizzle/conn.h \
147
 
                                libdrizzle-2.0/libdrizzle/conn_client.h \
148
 
                                libdrizzle-2.0/libdrizzle/conn_server.h \
149
 
                                libdrizzle-2.0/libdrizzle/constants.h \
150
 
                                libdrizzle-2.0/libdrizzle/drizzle.h \
151
 
                                libdrizzle-2.0/libdrizzle/drizzle_client.h \
152
 
                                libdrizzle-2.0/libdrizzle/drizzle_server.h \
153
 
                                libdrizzle-2.0/libdrizzle/field_client.h \
154
 
                                libdrizzle-2.0/libdrizzle/field_server.h \
155
 
                                libdrizzle-2.0/libdrizzle/handshake_client.h \
156
 
                                libdrizzle-2.0/libdrizzle/handshake_server.h \
157
 
                                libdrizzle-2.0/libdrizzle/libdrizzle.h \
158
 
                                libdrizzle-2.0/libdrizzle/libdrizzle.hpp \
159
 
                                libdrizzle-2.0/libdrizzle/query.h \
160
 
                                libdrizzle-2.0/libdrizzle/result.h \
161
 
                                libdrizzle-2.0/libdrizzle/result_client.h \
162
 
                                libdrizzle-2.0/libdrizzle/result_server.h \
163
 
                                libdrizzle-2.0/libdrizzle/row_client.h \
164
 
                                libdrizzle-2.0/libdrizzle/row_server.h \
165
 
                                libdrizzle-2.0/libdrizzle/structs.h \
166
 
                                libdrizzle-2.0/libdrizzle/visibility.h
 
139
                                libdrizzle-2.0/column.h \
 
140
                                libdrizzle-2.0/column_client.h \
 
141
                                libdrizzle-2.0/column_server.h \
 
142
                                libdrizzle-2.0/command_client.h \
 
143
                                libdrizzle-2.0/command_server.h \
 
144
                                libdrizzle-2.0/conn.h \
 
145
                                libdrizzle-2.0/conn_client.h \
 
146
                                libdrizzle-2.0/conn_server.h \
 
147
                                libdrizzle-2.0/constants.h \
 
148
                                libdrizzle-2.0/drizzle.h \
 
149
                                libdrizzle-2.0/drizzle_client.h \
 
150
                                libdrizzle-2.0/drizzle_server.h \
 
151
                                libdrizzle-2.0/field_client.h \
 
152
                                libdrizzle-2.0/field_server.h \
 
153
                                libdrizzle-2.0/handshake_client.h \
 
154
                                libdrizzle-2.0/handshake_server.h \
 
155
                                libdrizzle-2.0/libdrizzle.h \
 
156
                                libdrizzle-2.0/libdrizzle.hpp \
 
157
                                libdrizzle-2.0/query.h \
 
158
                                libdrizzle-2.0/result.h \
 
159
                                libdrizzle-2.0/result_client.h \
 
160
                                libdrizzle-2.0/result_server.h \
 
161
                                libdrizzle-2.0/row_client.h \
 
162
                                libdrizzle-2.0/row_server.h \
 
163
                                libdrizzle-2.0/structs.h \
 
164
                                libdrizzle-2.0/visibility.h
167
165
 
168
166
noinst_HEADERS+= \
169
 
                 libdrizzle-2.0/libdrizzle/common.h \
170
 
                 libdrizzle-2.0/libdrizzle/drizzle_local.h \
171
 
                 libdrizzle-2.0/libdrizzle/conn_local.h \
172
 
                 libdrizzle-2.0/libdrizzle/pack.h \
173
 
                 libdrizzle-2.0/libdrizzle/state.h \
174
 
                 libdrizzle-2.0/libdrizzle/sha1.h
175
 
 
176
 
 
177
 
libdrizzle: libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la
 
167
                 libdrizzle-2.0/common.h \
 
168
                 libdrizzle-2.0/drizzle_local.h \
 
169
                 libdrizzle-2.0/conn_local.h \
 
170
                 libdrizzle-2.0/pack.h \
 
171
                 libdrizzle-2.0/state.h \
 
172
                 libdrizzle-2.0/sha1.h
 
173
 
 
174
 
 
175
libdrizzle: libdrizzle-2.0/libdrizzle-2.0.la
178
176
install-libdrizzle: libdrizzle install-dist_libdrizzleinstallHEADERS
179
177
        test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
180
 
        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la "$(DESTDIR)$(libdir)"
 
178
        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) libdrizzle-2.0/libdrizzle-2.0.la "$(DESTDIR)$(libdir)"