← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle-2.0/libdrizzle/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:
libdrizzle-2.0/libdrizzle/include.am
33
33
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34
34
#
35
35
 
36
 
lib_LTLIBRARIES+= libdrizzle-2.0/libdrizzle/libdrizzle.la
 
36
lib_LTLIBRARIES+= libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la
37
37
 
38
38
if HAVE_LIBSQLITE3
39
39
SQLITE_PROGS= examples/sqlite_server
42
42
noinst_PROGRAMS+= \
43
43
                  libdrizzle-2.0/libdrizzle/mysql_password_hash
44
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.la
 
45
libdrizzle_2_0_libdrizzle_mysql_password_hash_LDADD= libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la
46
46
libdrizzle_2_0_libdrizzle_mysql_password_hash_SOURCES= libdrizzle-2.0/libdrizzle/mysql_password_hash.cc
47
47
 
48
48
noinst_PROGRAMS+= \
54
54
        examples/proxy \
55
55
        $(SQLITE_PROGS)
56
56
 
57
 
libdrizzle_2_0_libdrizzle_libdrizzle_la_CXXFLAGS= \
 
57
libdrizzle_2_0_libdrizzle_libdrizzle_2_0_la_CXXFLAGS= \
58
58
        ${AM_CXXFLAGS} \
59
59
        ${LIBDRIZZLE_CPPFLAGS} \
60
60
        ${CFLAG_VISIBILITY} \
61
61
        -DBUILDING_LIBDRIZZLE
62
62
 
63
 
libdrizzle_2_0_libdrizzle_libdrizzle_la_LDFLAGS= \
 
63
libdrizzle_2_0_libdrizzle_libdrizzle_2_0_la_LDFLAGS= \
64
64
        $(AM_LDFLAGS) \
65
65
        $(GCOV_LIBS) \
66
66
        -version-info \
70
70
libdrizzlepkgconfig_DATA= \
71
71
                          support-files/libdrizzle-2.0.pc
72
72
 
73
 
libdrizzle_2_0_libdrizzle_libdrizzle_la_SOURCES= \
 
73
libdrizzle_2_0_libdrizzle_libdrizzle_2_0_la_SOURCES= \
74
74
        libdrizzle-2.0/libdrizzle/column.cc \
75
75
        libdrizzle-2.0/libdrizzle/command.cc \
76
76
        libdrizzle-2.0/libdrizzle/conn.cc \
89
89
                          $(AM_CXXFLAGS) \
90
90
                          ${LIBDRIZZLE_CPPFLAGS}
91
91
examples_server_SOURCES= examples/server.cc
92
 
examples_server_LDADD= libdrizzle-2.0/libdrizzle/libdrizzle.la
 
92
examples_server_LDADD= libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la
93
93
 
94
94
examples_proxy_CXXFLAGS= \
95
95
                         $(AM_CXXFLAGS) \
96
96
                         ${LIBDRIZZLE_CPPFLAGS}
97
97
examples_proxy_SOURCES= examples/proxy.cc
98
 
examples_proxy_LDADD= libdrizzle-2.0/libdrizzle/libdrizzle.la
 
98
examples_proxy_LDADD= libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la
99
99
 
100
100
examples_client_CXXFLAGS= \
101
101
                          $(AM_CXXFLAGS) \
102
102
                          ${LIBDRIZZLE_CPPFLAGS}
103
103
examples_client_SOURCES= examples/client.cc
104
 
examples_client_LDADD= libdrizzle-2.0/libdrizzle/libdrizzle.la
 
104
examples_client_LDADD= libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la
105
105
 
106
106
examples_simple_CXXFLAGS= \
107
107
                          $(AM_CXXFLAGS) \
108
108
                          ${LIBDRIZZLE_CPPFLAGS}
109
109
examples_simple_SOURCES= examples/simple.cc
110
 
examples_simple_LDADD= libdrizzle-2.0/libdrizzle/libdrizzle.la
 
110
examples_simple_LDADD= libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la
111
111
 
112
112
examples_simple_multi_CXXFLAGS= \
113
113
                                $(AM_CXXFLAGS) \
114
114
                                ${LIBDRIZZLE_CPPFLAGS}
115
115
examples_simple_multi_SOURCES= examples/simple_multi.cc
116
 
examples_simple_multi_LDADD= libdrizzle-2.0/libdrizzle/libdrizzle.la
 
116
examples_simple_multi_LDADD= libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la
117
117
 
118
118
examples_pipe_query_CXXFLAGS= \
119
119
                              $(AM_CXXFLAGS) \
120
120
                              ${LIBDRIZZLE_CPPFLAGS}
121
121
examples_pipe_query_SOURCES= examples/pipe_query.cc
122
 
examples_pipe_query_LDADD= libdrizzle-2.0/libdrizzle/libdrizzle.la
 
122
examples_pipe_query_LDADD= libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la
123
123
 
124
124
if HAVE_LIBSQLITE3
125
125
examples_sqlite_server_CXXFLAGS= \
126
126
                                 $(AM_CXXFLAGS) \
127
127
                                 ${LIBDRIZZLE_CPPFLAGS}
128
 
examples_sqlite_server_LDFLAGS= libdrizzle-2.0/libdrizzle/libdrizzle.la $(LTLIBSQLITE3)
129
 
examples_sqlite_server_DEPENDENCIES= libdrizzle-2.0/libdrizzle/libdrizzle.la
 
128
examples_sqlite_server_LDFLAGS= libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la $(LTLIBSQLITE3)
 
129
examples_sqlite_server_DEPENDENCIES= libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la
130
130
examples_sqlite_server_SOURCES= examples/sqlite_server.cc
131
131
endif
132
132
 
166
166
                 libdrizzle-2.0/libdrizzle/sha1.h
167
167
 
168
168
 
169
 
libdrizzle: libdrizzle-2.0/libdrizzle/libdrizzle.la
 
169
libdrizzle: libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la
170
170
install-libdrizzle: libdrizzle install-dist_libdrizzleinstallHEADERS install-libdrizzlepkgconfigDATA
171
171
        test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
172
 
        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) libdrizzle-2.0/libdrizzle/libdrizzle.la "$(DESTDIR)$(libdir)"
 
172
        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la "$(DESTDIR)$(libdir)"