← 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-04 21:13:51 UTC
  • mfrom: (2449.1.2 drizzle-build)
  • Revision ID: me@mark.atwood.name-20111104211351-us53noq84fuqafqv
merge lp:~brianaker/drizzle/bug-fix-879128

Show diffs side-by-side

added added

removed removed

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