← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to Makefile.am

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.am
54
54
 
55
55
MAINTAINERCLEANFILES=   autom4te.cache
56
56
 
57
 
CLIENT_LDADD=           mysys/libmysys.la \
58
 
                        mystrings/libmystrings.la \
59
 
                        $(LIBDRIZZLE) $(LIBINTL) $(LIBZ) \
60
 
                        client/libgetpassword.la
 
57
CLIENT_LDADD=\
 
58
                drizzled/internal/libinternal.la \
 
59
                $(LIBDRIZZLE) $(LIBINTL) $(LIBZ) \
 
60
                gnulib/libgnu.la \
 
61
                client/libgetpassword.la
61
62
 
62
63
noinst_LTLIBRARIES+= \
63
 
                client/libgetpassword.la \
64
 
                mysys/libmysys.la \
65
 
                mystrings/libmystrings.la
 
64
                client/libgetpassword.la
66
65
 
67
66
noinst_PROGRAMS+=\
68
67
                client/drizzletest \
83
82
 
84
83
client_libgetpassword_la_SOURCES= client/get_password.cc
85
84
 
86
 
noinst_HEADERS+=        \
 
85
noinst_HEADERS+=\
87
86
                client/client_priv.h \
88
87
                client/errname.h \
89
88
                client/get_password.h \
90
89
                client/linebuffer.h \
91
 
                drizzled/configmake.h \
92
 
                mystrings/decimal.h \
93
 
                mysys/dynamic_array.h \
94
 
                mystrings/m_ctype.h \
95
 
                mystrings/m_string.h \
96
 
                mystrings/my_uctype.h \
97
 
                mystrings/t_ctype.h \
98
 
                mystrings/utf8.h \
99
 
                mysys/aio_result.h \
100
 
                mysys/cached_directory.h \
101
 
                mysys/definitions.h \
102
 
                mysys/drizzle_time.h \
103
 
                mysys/hash.h \
104
 
                mysys/iocache.h \
105
 
                mysys/my_alloc.h \
106
 
                mysys/my_bit.h \
107
 
                mysys/my_bitmap.h \
108
 
                mysys/my_dir.h \
109
 
                mysys/my_getopt.h \
110
 
                mysys/my_pthread.h \
111
 
                mysys/my_static.h \
112
 
                mysys/my_sys.h \
113
 
                mysys/my_time.h \
114
 
                mysys/my_tree.h \
115
 
                mysys/mysys_err.h \
116
 
                mysys/mysys_priv.h \
117
 
                mysys/thr_lock.h \
118
 
                mysys/typelib.h
119
 
 
120
 
mystrings_libmystrings_la_SOURCES= \
121
 
                mystrings/bmove_upp.cc \
122
 
                mystrings/ctype-bin.cc \
123
 
                mystrings/ctype-mb.cc \
124
 
                mystrings/ctype-simple.cc \
125
 
                mystrings/ctype-uca.cc \
126
 
                mystrings/ctype-utf8.cc \
127
 
                mystrings/ctype.cc \
128
 
                mystrings/decimal.cc \
129
 
                mystrings/dtoa.cc \
130
 
                mystrings/int2str.cc \
131
 
                mystrings/llstr.cc \
132
 
                mystrings/longlong2str.cc \
133
 
                mystrings/my_strtoll10.cc
134
 
 
135
 
mysys_libmysys_la_SOURCES= \
136
 
                mysys/cached_directory.cc \
137
 
                mysys/charset-def.cc \
138
 
                mysys/charset.cc \
139
 
                mysys/checksum.cc \
140
 
                mysys/default.cc \
141
 
                mysys/dynamic_array.cc \
142
 
                mysys/errors.cc \
143
 
                mysys/hash.cc \
144
 
                mysys/mf_arr_appstr.cc \
145
 
                mysys/mf_cache.cc \
146
 
                mysys/mf_dirname.cc \
147
 
                mysys/mf_fn_ext.cc \
148
 
                mysys/mf_format.cc \
149
 
                mysys/mf_getdate.cc \
150
 
                mysys/mf_iocache.cc \
151
 
                mysys/mf_loadpath.cc \
152
 
                mysys/mf_pack.cc \
153
 
                mysys/mf_qsort.cc \
154
 
                mysys/mf_qsort2.cc \
155
 
                mysys/mf_radix.cc \
156
 
                mysys/mf_same.cc \
157
 
                mysys/mf_sort.cc \
158
 
                mysys/mf_tempfile.cc \
159
 
                mysys/mf_wcomp.cc \
160
 
                mysys/my_access.cc \
161
 
                mysys/my_alloc.cc \
162
 
                mysys/my_bit.cc \
163
 
                mysys/my_bitmap.cc \
164
 
                mysys/my_copy.cc \
165
 
                mysys/my_create.cc \
166
 
                mysys/my_delete.cc \
167
 
                mysys/my_error.cc \
168
 
                mysys/my_getopt.cc \
169
 
                mysys/my_getsystime.cc \
170
 
                mysys/my_init.cc \
171
 
                mysys/my_lib.cc \
172
 
                mysys/my_open.cc \
173
 
                mysys/my_read.cc \
174
 
                mysys/my_redel.cc \
175
 
                mysys/my_rename.cc \
176
 
                mysys/my_static.cc \
177
 
                mysys/my_symlink.cc \
178
 
                mysys/my_symlink2.cc \
179
 
                mysys/my_sync.cc \
180
 
                mysys/my_thr_init.cc \
181
 
                mysys/my_time.cc \
182
 
                mysys/my_tree.cc \
183
 
                mysys/my_write.cc \
184
 
                mysys/ptr_cmp.cc \
185
 
                mysys/thr_lock.cc \
186
 
                mysys/typelib.cc
 
90
                drizzled/configmake.h
 
91
 
187
92
 
188
93
client_drizzle_SOURCES=         client/drizzle.cc client/linebuffer.cc
189
94
client_drizzle_LDADD=           ${CLIENT_LDADD} ${READLINE_LIBS}
206
111
 
207
112
extra_my_print_defaults_SOURCES= extra/my_print_defaults.cc
208
113
extra_my_print_defaults_LDADD= \
209
 
                $(top_builddir)/mysys/libmysys.la \
210
 
                $(top_builddir)/mystrings/libmystrings.la \
 
114
                drizzled/internal/libinternal.la \
 
115
                gnulib/libgnu.la \
211
116
                $(LIBINTL)
212
117
 
213
118
EXTRA_DIST+=    ${man_MANS}
286
191
include config/lint-source.am
287
192
 
288
193
include drizzled/include.am
 
194
include drizzled/internal/include.am
289
195
include drizzled/hash/include.am
290
196
include drizzled/util/include.am
291
197
include drizzled/message/include.am