← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle-1.0/libdrizzle/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:
libdrizzle-1.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/libdrizzle.la
37
 
 
38
 
if HAVE_LIBSQLITE3
39
 
SQLITE_PROGS= examples/sqlite_server
40
 
endif
41
 
 
42
 
noinst_PROGRAMS+= \
43
 
                  libdrizzle/mysql_password_hash
44
 
libdrizzle_mysql_password_hash_LDADD= libdrizzle/libdrizzle.la
45
 
libdrizzle_mysql_password_hash_SOURCES= libdrizzle/mysql_password_hash.cc
46
 
 
47
 
noinst_PROGRAMS+= \
48
 
        examples/client \
49
 
        examples/simple \
50
 
        examples/simple_multi \
51
 
        examples/pipe_query \
52
 
        examples/server \
53
 
        examples/proxy \
54
 
        $(SQLITE_PROGS)
55
 
 
56
 
libdrizzle_libdrizzle_la_CFLAGS= \
 
36
noinst_LTLIBRARIES+= libdrizzle-1.0/libdrizzle/libdrizzle.la
 
37
 
 
38
libdrizzle_1_0_libdrizzle_libdrizzle_la_CFLAGS= \
57
39
        ${AM_CFLAGS} \
 
40
        ${OLDLIBDRIZZLE_CPPFLAGS} \
58
41
        ${CFLAG_VISIBILITY} \
59
42
        -DBUILDING_LIBDRIZZLE
60
43
 
61
 
libdrizzle_libdrizzle_la_LDFLAGS= \
62
 
        $(AM_LDFLAGS) \
63
 
        -version-info \
64
 
        $(LIBDRIZZLE_LIBRARY_VERSION)
65
 
 
66
 
libdrizzle_libdrizzle_la_SOURCES= \
67
 
        libdrizzle/drizzle.c \
68
 
        libdrizzle/conn.c \
69
 
        libdrizzle/conn_uds.c \
70
 
        libdrizzle/handshake.c \
71
 
        libdrizzle/command.c \
72
 
        libdrizzle/query.c \
73
 
        libdrizzle/result.c \
74
 
        libdrizzle/column.c \
75
 
        libdrizzle/row.c \
76
 
        libdrizzle/field.c \
77
 
        libdrizzle/pack.c \
78
 
        libdrizzle/state.c \
79
 
        libdrizzle/sha1.c
80
 
 
81
 
examples_server_CFLAGS= $(AM_CFLAGS)
82
 
examples_server_SOURCES= examples/server.c
83
 
examples_server_LDADD= libdrizzle/libdrizzle.la
84
 
 
85
 
examples_proxy_CFLAGS= $(AM_CFLAGS)
86
 
examples_proxy_SOURCES= examples/proxy.c
87
 
examples_proxy_LDADD= libdrizzle/libdrizzle.la
88
 
 
89
 
examples_client_LDADD= libdrizzle/libdrizzle.la
90
 
examples_simple_LDADD= libdrizzle/libdrizzle.la
91
 
examples_simple_multi_LDADD= libdrizzle/libdrizzle.la
92
 
examples_pipe_query_LDADD= libdrizzle/libdrizzle.la
93
 
 
94
 
if HAVE_LIBSQLITE3
95
 
examples_sqlite_server_CFLAGS= $(AM_CFLAGS)
96
 
examples_sqlite_server_LDFLAGS= libdrizzle/libdrizzle.la $(LTLIBSQLITE3)
97
 
examples_sqlite_server_DEPENDENCIES= libdrizzle/libdrizzle.la
98
 
examples_sqlite_server_SOURCES= examples/sqlite_server.c
99
 
endif
100
 
 
101
 
nobase_dist_libdrizzleinclude_HEADERS= \
102
 
        libdrizzle/column.h \
103
 
        libdrizzle/column_client.h \
104
 
        libdrizzle/column_server.h \
105
 
        libdrizzle/command_client.h \
106
 
        libdrizzle/command_server.h \
107
 
        libdrizzle/conn.h \
108
 
        libdrizzle/conn_client.h \
109
 
        libdrizzle/conn_server.h \
110
 
        libdrizzle/constants.h \
111
 
        libdrizzle/drizzle.h \
112
 
        libdrizzle/drizzle_client.h \
113
 
        libdrizzle/drizzle_server.h \
114
 
        libdrizzle/field_client.h \
115
 
        libdrizzle/field_server.h \
116
 
        libdrizzle/handshake_client.h \
117
 
        libdrizzle/handshake_server.h \
118
 
        libdrizzle/libdrizzle.h \
119
 
        libdrizzle/query.h \
120
 
        libdrizzle/result.h \
121
 
        libdrizzle/result_client.h \
122
 
        libdrizzle/result_server.h \
123
 
        libdrizzle/row_client.h \
124
 
        libdrizzle/row_server.h \
125
 
        libdrizzle/structs.h \
126
 
        libdrizzle/visibility.h
 
44
libdrizzle_1_0_libdrizzle_libdrizzle_la_LDFLAGS= \
 
45
        $(AM_LDFLAGS)
 
46
 
 
47
oldlibdrizzlepkgconfigdir= $(libdir)/pkgconfig
 
48
oldlibdrizzlepkgconfig_DATA= \
 
49
                             support-files/libdrizzle-1.0.pc
 
50
 
 
51
libdrizzle_1_0_libdrizzle_libdrizzle_la_SOURCES= \
 
52
        libdrizzle-1.0/libdrizzle/column.c \
 
53
        libdrizzle-1.0/libdrizzle/command.c \
 
54
        libdrizzle-1.0/libdrizzle/conn.c \
 
55
        libdrizzle-1.0/libdrizzle/conn_uds.c \
 
56
        libdrizzle-1.0/libdrizzle/drizzle.c \
 
57
        libdrizzle-1.0/libdrizzle/field.c \
 
58
        libdrizzle-1.0/libdrizzle/handshake.c \
 
59
        libdrizzle-1.0/libdrizzle/pack.c \
 
60
        libdrizzle-1.0/libdrizzle/query.c \
 
61
        libdrizzle-1.0/libdrizzle/result.c \
 
62
        libdrizzle-1.0/libdrizzle/row.c \
 
63
        libdrizzle-1.0/libdrizzle/sha1.c \
 
64
        libdrizzle-1.0/libdrizzle/state.c
 
65
 
 
66
dist_oldlibdrizzleinstall_HEADERS= \
 
67
        libdrizzle-1.0/libdrizzle/column.h \
 
68
        libdrizzle-1.0/libdrizzle/column_client.h \
 
69
        libdrizzle-1.0/libdrizzle/column_server.h \
 
70
        libdrizzle-1.0/libdrizzle/command_client.h \
 
71
        libdrizzle-1.0/libdrizzle/command_server.h \
 
72
        libdrizzle-1.0/libdrizzle/conn.h \
 
73
        libdrizzle-1.0/libdrizzle/conn_client.h \
 
74
        libdrizzle-1.0/libdrizzle/conn_server.h \
 
75
        libdrizzle-1.0/libdrizzle/constants.h \
 
76
        libdrizzle-1.0/libdrizzle/drizzle.h \
 
77
        libdrizzle-1.0/libdrizzle/drizzle_client.h \
 
78
        libdrizzle-1.0/libdrizzle/drizzle_server.h \
 
79
        libdrizzle-1.0/libdrizzle/field_client.h \
 
80
        libdrizzle-1.0/libdrizzle/field_server.h \
 
81
        libdrizzle-1.0/libdrizzle/handshake_client.h \
 
82
        libdrizzle-1.0/libdrizzle/handshake_server.h \
 
83
        libdrizzle-1.0/libdrizzle/libdrizzle.h \
 
84
        libdrizzle-1.0/libdrizzle/query.h \
 
85
        libdrizzle-1.0/libdrizzle/result.h \
 
86
        libdrizzle-1.0/libdrizzle/result_client.h \
 
87
        libdrizzle-1.0/libdrizzle/result_server.h \
 
88
        libdrizzle-1.0/libdrizzle/row_client.h \
 
89
        libdrizzle-1.0/libdrizzle/row_server.h \
 
90
        libdrizzle-1.0/libdrizzle/structs.h \
 
91
        libdrizzle-1.0/libdrizzle/visibility.h
127
92
 
128
93
noinst_HEADERS+= \
129
 
        libdrizzle/common.h \
130
 
        libdrizzle/drizzle_local.h \
131
 
        libdrizzle/conn_local.h \
132
 
        libdrizzle/pack.h \
133
 
        libdrizzle/state.h \
134
 
        libdrizzle/sha1.h
135
 
 
136
 
CLEANFILES+= \
137
 
        doxerr.log \
138
 
        libdrizzle/drizzle_client.h.gch \
139
 
        libdrizzle/drizzle_server.h.gch \
140
 
        libdrizzle/common.h.gch
141
 
 
142
 
libdrizzle: libdrizzle/libdrizzle.la
143
 
install-libdrizzle:
144
 
        test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
145
 
        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) libdrizzle/libdrizzle.la "$(DESTDIR)$(libdir)"
146
 
        test -z "$(libdrizzleincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libdrizzleincludedir)"
147
 
        @list='$(nobase_dist_libdrizzleinclude_HEADERS)'; test -n "$(libdrizzleincludedir)" || list=; \
148
 
        $(am__nobase_list) | while read dir files; do \
149
 
          if test "x$$dir" = "xlibdrizzle" ; then \
150
 
            xfiles=; for file in $$files; do \
151
 
              if test -f "$$file"; then xfiles="$$xfiles $$file"; \
152
 
              else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
153
 
            test -z "$$xfiles" || { \
154
 
              test "x$$dir" = x. || { \
155
 
                echo "$(MKDIR_P) '$(DESTDIR)$(libdrizzleincludedir)/$$dir'"; \
156
 
                $(MKDIR_P) "$(DESTDIR)$(libdrizzleincludedir)/$$dir"; }; \
157
 
              echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(libdrizzleincludedir)/$$dir'"; \
158
 
              $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(libdrizzleincludedir)/$$dir" || exit $$?; }; \
159
 
          fi; \
160
 
        done
 
94
        libdrizzle-1.0/libdrizzle/common.h \
 
95
        libdrizzle-1.0/libdrizzle/drizzle_local.h \
 
96
        libdrizzle-1.0/libdrizzle/conn_local.h \
 
97
        libdrizzle-1.0/libdrizzle/pack.h \
 
98
        libdrizzle-1.0/libdrizzle/state.h \
 
99
        libdrizzle-1.0/libdrizzle/sha1.h
 
100
 
 
101
libdrizzle-1.0: libdrizzle-1.0/libdrizzle/libdrizzle.la
 
102
install-libdrizzle-1.0: libdrizzle-1.0 install-dist_oldlibdrizzleinstallHEADERS install-oldlibdrizzlepkgconfigDATA