~drizzle-trunk/drizzle/development

1265 by Brian Aker
Updated Makefile.am to push client rules to include.am
1
# vim:ft=automake
2
# included from Top Level Makefile.am
3
# All paths should be given relative to the root
4
492.1.7 by Monty Taylor
Moved test() to its own file.
5
#  Copyright (C) 2008 Sun Microsystems
6
# 
7
#  This program is free software; you can redistribute it and/or modify
8
#  it under the terms of the GNU General Public License as published by
9
#  the Free Software Foundation; version 2 of the License.
10
#
11
#  This program is distributed in the hope that it will be useful,
12
#  but WITHOUT ANY WARRANTY; without even the implied warranty of
13
#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
#  GNU General Public License for more details.
15
#
16
#  You should have received a copy of the GNU General Public License
17
#  along with this program; if not, write to the Free Software
18
#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
1 by brian
clean slate
19
187 by Brian Aker
Fixed tab issue
20
1297 by Brian Aker
Fix style issue.
21
DTRACEFILES= \
22
	     drizzled/cursor.o \
23
	     drizzled/drizzled.o \
24
	     drizzled/filesort.o \
25
	     drizzled/join.o \
26
	     drizzled/session.o \
1497.3.14 by Monty Taylor
Include signal_handler.o in DTRACE_FILES. Silly me.
27
	     drizzled/signal_handler.o \
1297 by Brian Aker
Fix style issue.
28
	     drizzled/sql_delete.o \
29
	     drizzled/sql_insert.o \
30
	     drizzled/sql_parse.o \
31
	     drizzled/sql_select.o \
32
	     drizzled/sql_update.o \
33
	     drizzled/statement/delete.o \
34
	     drizzled/statement/insert.o \
35
	     drizzled/statement/insert_select.o
187 by Brian Aker
Fixed tab issue
36
1253.2.2 by Monty Taylor
Fixed header install.
37
nobase_dist_include_HEADERS+= \
1285 by Brian Aker
Remove giant include header to its own file.
38
			      drizzled/alter_column.h \
39
			      drizzled/alter_drop.h \
40
			      drizzled/alter_info.h \
41
			      drizzled/atomic/gcc_traits.h \
42
			      drizzled/atomic/pthread_traits.h \
43
			      drizzled/atomic/sun_studio.h \
44
			      drizzled/atomics.h \
45
			      drizzled/base.h \
46
			      drizzled/cached_directory.h \
47
			      drizzled/cached_item.h \
48
			      drizzled/calendar.h \
49
			      drizzled/charset.h \
50
			      drizzled/charset_info.h \
51
			      drizzled/check_stack_overrun.h \
52
			      drizzled/common.h \
53
			      drizzled/comp_creator.h \
54
			      drizzled/create_field.h \
55
			      drizzled/current_session.h \
1471.3.2 by Monty Taylor
Merged in old drizzled-as-lib patch.
56
			      drizzled/cursor.h \
1285 by Brian Aker
Remove giant include header to its own file.
57
			      drizzled/data_home.h \
58
			      drizzled/db.h \
59
			      drizzled/decimal.h \
60
			      drizzled/definitions.h \
61
			      drizzled/diagnostics_area.h \
62
			      drizzled/discrete_interval.h \
1471.3.2 by Monty Taylor
Merged in old drizzled-as-lib patch.
63
			      drizzled/drizzle_time.h \
1300.5.2 by Monty Taylor
Changed build to build the almost all of drizzle into libdrizzled and then
64
			      drizzled/drizzled.h \
1285 by Brian Aker
Remove giant include header to its own file.
65
			      drizzled/dtcollation.h \
66
			      drizzled/dynamic_array.h \
67
			      drizzled/enum.h \
68
			      drizzled/enum_nested_loop_state.h \
69
			      drizzled/errmsg_print.h \
70
			      drizzled/error.h \
71
			      drizzled/field.h \
72
			      drizzled/field/blob.h \
73
			      drizzled/field/date.h \
74
			      drizzled/field/datetime.h \
75
			      drizzled/field/decimal.h \
76
			      drizzled/field/double.h \
77
			      drizzled/field/enum.h \
78
			      drizzled/field/int64_t.h \
79
			      drizzled/field/long.h \
80
			      drizzled/field/null.h \
81
			      drizzled/field/num.h \
82
			      drizzled/field/real.h \
83
			      drizzled/field/str.h \
84
			      drizzled/field/timestamp.h \
85
			      drizzled/field/varstring.h \
86
			      drizzled/field_iterator.h \
87
			      drizzled/file_exchange.h \
88
			      drizzled/filesort_info.h \
89
			      drizzled/foreign_key.h \
90
			      drizzled/function/additive_op.h \
91
			      drizzled/function/field.h \
92
			      drizzled/function/find_in_set.h \
93
			      drizzled/function/found_rows.h \
94
			      drizzled/function/func.h \
95
			      drizzled/function/get_system_var.h \
96
			      drizzled/function/get_user_var.h \
97
			      drizzled/function/last_insert.h \
98
			      drizzled/function/locate.h \
99
			      drizzled/function/math/abs.h \
100
			      drizzled/function/math/acos.h \
101
			      drizzled/function/math/asin.h \
102
			      drizzled/function/math/atan.h \
103
			      drizzled/function/math/ceiling.h \
104
			      drizzled/function/math/cos.h \
105
			      drizzled/function/math/dec.h \
106
			      drizzled/function/math/decimal_typecast.h \
107
			      drizzled/function/math/divide.h \
108
			      drizzled/function/math/exp.h \
109
			      drizzled/function/math/floor.h \
110
			      drizzled/function/math/int.h \
111
			      drizzled/function/math/int_divide.h \
112
			      drizzled/function/math/int_val.h \
113
			      drizzled/function/math/integer.h \
114
			      drizzled/function/math/ln.h \
115
			      drizzled/function/math/log.h \
116
			      drizzled/function/math/minus.h \
117
			      drizzled/function/math/mod.h \
118
			      drizzled/function/math/multiply.h \
119
			      drizzled/function/math/neg.h \
120
			      drizzled/function/math/ord.h \
121
			      drizzled/function/math/plus.h \
122
			      drizzled/function/math/pow.h \
123
			      drizzled/function/math/real.h \
124
			      drizzled/function/math/round.h \
125
			      drizzled/function/math/sin.h \
126
			      drizzled/function/math/sqrt.h \
127
			      drizzled/function/math/tan.h \
128
			      drizzled/function/min_max.h \
129
			      drizzled/function/num1.h \
130
			      drizzled/function/num_op.h \
131
			      drizzled/function/numhybrid.h \
132
			      drizzled/function/rollup_const.h \
133
			      drizzled/function/row_count.h \
134
			      drizzled/function/set_user_var.h \
135
			      drizzled/function/sign.h \
136
			      drizzled/function/str/alloc_buffer.h \
137
			      drizzled/function/str/binary.h \
138
			      drizzled/function/str/char.h \
139
			      drizzled/function/str/collation.h \
140
			      drizzled/function/str/concat.h \
141
			      drizzled/function/str/conv.h \
142
			      drizzled/function/str/conv_charset.h \
143
			      drizzled/function/str/elt.h \
144
			      drizzled/function/str/export_set.h \
145
			      drizzled/function/str/format.h \
146
			      drizzled/function/str/insert.h \
147
			      drizzled/function/str/left.h \
148
			      drizzled/function/str/load_file.h \
149
			      drizzled/function/str/make_set.h \
150
			      drizzled/function/str/pad.h \
151
			      drizzled/function/str/quote.h \
152
			      drizzled/function/str/repeat.h \
153
			      drizzled/function/str/replace.h \
154
			      drizzled/function/str/right.h \
155
			      drizzled/function/str/set_collation.h \
156
			      drizzled/function/str/str_conv.h \
157
			      drizzled/function/str/strfunc.h \
158
			      drizzled/function/str/trim.h \
159
			      drizzled/function/time/curdate.h \
160
			      drizzled/function/time/date.h \
161
			      drizzled/function/time/date_add_interval.h \
162
			      drizzled/function/time/date_format.h \
163
			      drizzled/function/time/dayname.h \
164
			      drizzled/function/time/dayofmonth.h \
165
			      drizzled/function/time/dayofyear.h \
166
			      drizzled/function/time/extract.h \
167
			      drizzled/function/time/from_days.h \
168
			      drizzled/function/time/from_unixtime.h \
169
			      drizzled/function/time/hour.h \
170
			      drizzled/function/time/last_day.h \
171
			      drizzled/function/time/makedate.h \
172
			      drizzled/function/time/microsecond.h \
173
			      drizzled/function/time/minute.h \
174
			      drizzled/function/time/month.h \
175
			      drizzled/function/time/now.h \
176
			      drizzled/function/time/period_add.h \
177
			      drizzled/function/time/period_diff.h \
178
			      drizzled/function/time/quarter.h \
179
			      drizzled/function/time/second.h \
180
			      drizzled/function/time/sysdate_local.h \
181
			      drizzled/function/time/timestamp_diff.h \
182
			      drizzled/function/time/to_days.h \
183
			      drizzled/function/time/typecast.h \
184
			      drizzled/function/time/unix_timestamp.h \
185
			      drizzled/function/time/weekday.h \
186
			      drizzled/function/time/year.h  \
187
			      drizzled/function/units.h \
188
			      drizzled/function/user_var_as_out_param.h \
189
			      drizzled/function_hash.h \
1643.3.4 by Brian Aker
Moved generators out of trunk of server.
190
			      drizzled/generator.h \
1643.3.7 by Brian Aker
Adding columns.
191
			      drizzled/generator/all_fields.h \
1643.3.5 by Brian Aker
Addd an "all_tables" generator to loop through all tables.
192
			      drizzled/generator/all_tables.h \
1643.3.4 by Brian Aker
Moved generators out of trunk of server.
193
			      drizzled/generator/schema.h \
194
			      drizzled/generator/table.h \
1285 by Brian Aker
Remove giant include header to its own file.
195
			      drizzled/gettext.h \
196
			      drizzled/global_charset_info.h \
197
			      drizzled/ha_statistics.h \
198
			      drizzled/handler_structs.h \
199
			      drizzled/hybrid_type.h \
200
			      drizzled/hybrid_type_traits.h \
201
			      drizzled/hybrid_type_traits_decimal.h \
202
			      drizzled/hybrid_type_traits_integer.h \
1660.1.1 by Brian Aker
Merge in move identifier work.
203
			      drizzled/identifier.h \
204
			      drizzled/identifier/schema.h \
205
			      drizzled/identifier/table.h \
1285 by Brian Aker
Remove giant include header to its own file.
206
			      drizzled/index_hint.h \
207
			      drizzled/internal_error_handler.h \
208
			      drizzled/item.h \
209
			      drizzled/item/basic_constant.h \
210
			      drizzled/item/bin_string.h \
211
			      drizzled/item/blob.h \
212
			      drizzled/item/cache.h \
213
			      drizzled/item/cache_decimal.h \
214
			      drizzled/item/cache_int.h \
215
			      drizzled/item/cache_real.h \
216
			      drizzled/item/cache_row.h \
217
			      drizzled/item/cache_str.h \
218
			      drizzled/item/cmpfunc.h \
219
			      drizzled/item/copy_string.h \
220
			      drizzled/item/create.h \
221
			      drizzled/item/decimal.h \
222
			      drizzled/item/default_value.h \
223
			      drizzled/item/direct_ref.h \
224
			      drizzled/item/empty_string.h \
225
			      drizzled/item/field.h \
226
			      drizzled/item/float.h \
227
			      drizzled/item/func.h \
228
			      drizzled/item/hex_string.h \
229
			      drizzled/item/ident.h \
230
			      drizzled/item/insert_value.h \
231
			      drizzled/item/int.h \
232
			      drizzled/item/int_with_ref.h \
233
			      drizzled/item/null.h \
234
			      drizzled/item/num.h \
235
			      drizzled/item/outer_ref.h \
236
			      drizzled/item/ref.h \
237
			      drizzled/item/ref_null_helper.h \
238
			      drizzled/item/return_date_time.h \
239
			      drizzled/item/return_int.h \
240
			      drizzled/item/row.h \
241
			      drizzled/item/string.h \
242
			      drizzled/item/subselect.h \
243
			      drizzled/item/sum.h \
244
			      drizzled/item/type_holder.h \
245
			      drizzled/item/uint.h \
1471.3.2 by Monty Taylor
Merged in old drizzled-as-lib patch.
246
			      drizzled/item_result.h \
1285 by Brian Aker
Remove giant include header to its own file.
247
			      drizzled/join.h \
248
			      drizzled/join_cache.h \
249
			      drizzled/join_table.h \
250
			      drizzled/key.h \
251
			      drizzled/key_map.h \
252
			      drizzled/key_part_spec.h \
253
			      drizzled/korr.h \
254
			      drizzled/lex_column.h \
255
			      drizzled/lex_input_stream.h \
256
			      drizzled/lex_string.h \
257
			      drizzled/lex_symbol.h \
258
			      drizzled/lock.h \
259
			      drizzled/lookup_symbol.h \
260
			      drizzled/memory/multi_malloc.h \
261
			      drizzled/memory/root.h \
1471.3.2 by Monty Taylor
Merged in old drizzled-as-lib patch.
262
			      drizzled/memory/sql_alloc.h \
1530.2.6 by Monty Taylor
Moved plugin::Context to module::Context.
263
			      drizzled/module/context.h \
1530.2.5 by Monty Taylor
Renamed classes that were in drizzled::plugin but which were not meant
264
			      drizzled/module/library.h \
265
			      drizzled/module/manifest.h \
266
			      drizzled/module/module.h \
1625.1.2 by Monty Taylor
Added option_context class, along with unittests, for adding a module
267
			      drizzled/module/option_context.h \
1626.2.1 by Monty Taylor
Added wrapper around variables_map to allow us to pull values back out of
268
			      drizzled/module/option_map.h \
1530.2.5 by Monty Taylor
Renamed classes that were in drizzled::plugin but which were not meant
269
			      drizzled/module/registry.h \
1285 by Brian Aker
Remove giant include header to its own file.
270
			      drizzled/my_hash.h \
271
			      drizzled/name_resolution_context.h \
272
			      drizzled/name_resolution_context_state.h \
273
			      drizzled/named_savepoint.h \
274
			      drizzled/natural_join_column.h \
275
			      drizzled/nested_join.h \
276
			      drizzled/open_tables_state.h \
1497.1.1 by Monty Taylor
Merged up with build.
277
			      drizzled/optimizer/access_method.h \
278
			      drizzled/optimizer/access_method/const.h \
279
			      drizzled/optimizer/access_method/index.h \
280
			      drizzled/optimizer/access_method/scan.h \
281
			      drizzled/optimizer/access_method/system.h \
282
			      drizzled/optimizer/access_method/unique_index.h \
283
			      drizzled/optimizer/access_method_factory.h \
1300.5.20 by Monty Taylor
Merged trunk.
284
			      drizzled/optimizer/cost_vector.h \
1471.3.2 by Monty Taylor
Merged in old drizzled-as-lib patch.
285
			      drizzled/optimizer/explain_plan.h \
1285 by Brian Aker
Remove giant include header to its own file.
286
			      drizzled/optimizer/key_field.h \
287
			      drizzled/optimizer/key_use.h \
288
			      drizzled/optimizer/position.h \
289
			      drizzled/optimizer/quick_group_min_max_select.h \
290
			      drizzled/optimizer/quick_index_merge_select.h \
291
			      drizzled/optimizer/quick_range.h \
292
			      drizzled/optimizer/quick_range_select.h \
293
			      drizzled/optimizer/quick_ror_intersect_select.h \
294
			      drizzled/optimizer/quick_ror_union_select.h \
295
			      drizzled/optimizer/range.h \
296
			      drizzled/optimizer/range_param.h \
297
			      drizzled/optimizer/sargable_param.h \
298
			      drizzled/optimizer/sel_arg.h \
1300.5.18 by Monty Taylor
Fixed the merge.
299
			      drizzled/optimizer/sel_imerge.h \
300
			      drizzled/optimizer/sel_tree.h \
1285 by Brian Aker
Remove giant include header to its own file.
301
			      drizzled/optimizer/sum.h \
302
			      drizzled/optimizer/table_read_plan.h \
1471.3.2 by Monty Taylor
Merged in old drizzled-as-lib patch.
303
			      drizzled/option.h \
1285 by Brian Aker
Remove giant include header to its own file.
304
			      drizzled/order.h \
305
			      drizzled/parser.h \
306
			      drizzled/plugin.h \
307
			      drizzled/plugin/authentication.h \
1300.5.18 by Monty Taylor
Fixed the merge.
308
			      drizzled/plugin/authorization.h \
1285 by Brian Aker
Remove giant include header to its own file.
309
			      drizzled/plugin/client.h \
1324.2.3 by Monty Taylor
Remove plugin deinit.
310
			      drizzled/plugin/daemon.h \
1285 by Brian Aker
Remove giant include header to its own file.
311
			      drizzled/plugin/error_message.h \
1502.5.7 by Barry.Leslie at PrimeBase
Renamed the 'Event' plugin to 'EventObserver' plugin along with some internal class renames to make things clearer.
312
			      drizzled/plugin/event_observer.h \
1285 by Brian Aker
Remove giant include header to its own file.
313
			      drizzled/plugin/function.h \
314
			      drizzled/plugin/listen.h \
315
			      drizzled/plugin/listen_tcp.h \
316
			      drizzled/plugin/logging.h \
1300.5.18 by Monty Taylor
Fixed the merge.
317
			      drizzled/plugin/monitored_in_transaction.h \
1285 by Brian Aker
Remove giant include header to its own file.
318
			      drizzled/plugin/null_client.h \
319
			      drizzled/plugin/plugin.h \
320
			      drizzled/plugin/query_cache.h \
1471.3.2 by Monty Taylor
Merged in old drizzled-as-lib patch.
321
			      drizzled/plugin/query_rewrite.h \
1471.3.3 by Monty Taylor
Added a missing file.
322
			      drizzled/plugin/replication.h \
1285 by Brian Aker
Remove giant include header to its own file.
323
			      drizzled/plugin/scheduler.h \
324
			      drizzled/plugin/storage_engine.h \
1273.13.58 by Brian Aker
Merge with tree.
325
			      drizzled/plugin/table_function.h \
1285 by Brian Aker
Remove giant include header to its own file.
326
			      drizzled/plugin/transaction_applier.h \
327
			      drizzled/plugin/transaction_reader.h \
328
			      drizzled/plugin/transaction_replicator.h \
1273.1.16 by Jay Pipes
Merge trunk and resolve conflicts
329
			      drizzled/plugin/transactional_storage_engine.h \
1471.3.2 by Monty Taylor
Merged in old drizzled-as-lib patch.
330
			      drizzled/plugin/version.h \
1300.5.19 by Monty Taylor
Added missing file from merge.
331
			      drizzled/plugin/xa_resource_manager.h \
1273.1.16 by Jay Pipes
Merge trunk and resolve conflicts
332
			      drizzled/plugin/xa_storage_engine.h \
1471.3.2 by Monty Taylor
Merged in old drizzled-as-lib patch.
333
			      drizzled/probes.h \
1285 by Brian Aker
Remove giant include header to its own file.
334
			      drizzled/pthread_globals.h \
335
			      drizzled/qsort_cmp.h \
336
			      drizzled/query_id.h \
337
			      drizzled/records.h \
338
			      drizzled/replication_services.h \
1273.1.17 by Jay Pipes
Fix missing files in include.am after merging trunk.
339
			      drizzled/resource_context.h \
1285 by Brian Aker
Remove giant include header to its own file.
340
			      drizzled/security_context.h \
341
			      drizzled/select_create.h \
342
			      drizzled/select_dump.h \
343
			      drizzled/select_dumpvar.h \
344
			      drizzled/select_exists_subselect.h \
345
			      drizzled/select_export.h \
346
			      drizzled/select_insert.h \
347
			      drizzled/select_max_min_finder_subselect.h \
348
			      drizzled/select_result.h \
349
			      drizzled/select_result_interceptor.h \
350
			      drizzled/select_send.h \
351
			      drizzled/select_singlerow_subselect.h \
352
			      drizzled/select_subselect.h \
353
			      drizzled/select_to_file.h \
354
			      drizzled/select_union.h \
355
			      drizzled/session.h \
356
			      drizzled/session_list.h \
357
			      drizzled/set_var.h \
358
			      drizzled/show.h \
1300.5.22 by Monty Taylor
Moved and reworked a wrapper around sigset - which we shouldn't be using
359
			      drizzled/signal_handler.h \
1285 by Brian Aker
Remove giant include header to its own file.
360
			      drizzled/sql_base.h \
361
			      drizzled/sql_bitmap.h \
362
			      drizzled/sql_error.h \
363
			      drizzled/sql_lex.h \
364
			      drizzled/sql_list.h \
365
			      drizzled/sql_load.h \
366
			      drizzled/sql_locale.h \
367
			      drizzled/sql_parse.h \
368
			      drizzled/sql_select.h \
369
			      drizzled/sql_sort.h \
370
			      drizzled/sql_state.h \
371
			      drizzled/sql_string.h \
372
			      drizzled/sql_table.h \
373
			      drizzled/sql_union.h \
374
			      drizzled/statement.h \
375
			      drizzled/statement/alter_schema.h \
376
			      drizzled/statement/alter_table.h \
377
			      drizzled/statement/analyze.h \
378
			      drizzled/statement/change_schema.h \
379
			      drizzled/statement/check.h \
380
			      drizzled/statement/commit.h \
381
			      drizzled/statement/create_index.h \
382
			      drizzled/statement/create_schema.h \
383
			      drizzled/statement/create_table.h \
384
			      drizzled/statement/delete.h \
385
			      drizzled/statement/drop_index.h \
386
			      drizzled/statement/drop_schema.h \
387
			      drizzled/statement/drop_table.h \
388
			      drizzled/statement/empty_query.h \
389
			      drizzled/statement/flush.h \
390
			      drizzled/statement/insert.h \
391
			      drizzled/statement/insert_select.h \
392
			      drizzled/statement/kill.h \
393
			      drizzled/statement/load.h \
394
			      drizzled/statement/release_savepoint.h \
395
			      drizzled/statement/rename_table.h \
396
			      drizzled/statement/replace.h \
397
			      drizzled/statement/replace_select.h \
398
			      drizzled/statement/rollback.h \
399
			      drizzled/statement/rollback_to_savepoint.h \
400
			      drizzled/statement/savepoint.h \
401
			      drizzled/statement/select.h \
402
			      drizzled/statement/set_option.h \
403
			      drizzled/statement/show_create.h \
404
			      drizzled/statement/show_create_schema.h \
405
			      drizzled/statement/show_errors.h \
406
			      drizzled/statement/show_warnings.h \
407
			      drizzled/statement/start_transaction.h \
408
			      drizzled/statement/truncate.h \
409
			      drizzled/statement/unlock_tables.h \
410
			      drizzled/statement/update.h \
1561.3.19 by Joe Daly
move GPL code back to the core from logging_stats plugin
411
			      drizzled/status_helper.h \
1285 by Brian Aker
Remove giant include header to its own file.
412
			      drizzled/stored_key.h \
413
			      drizzled/strfunc.h \
414
			      drizzled/structs.h \
415
			      drizzled/symbol_hash.h \
416
			      drizzled/table.h \
1273.13.58 by Brian Aker
Merge with tree.
417
			      drizzled/table_function_container.h \
1285 by Brian Aker
Remove giant include header to its own file.
418
			      drizzled/table_ident.h \
419
			      drizzled/table_list.h \
1660.1.1 by Brian Aker
Merge in move identifier work.
420
 			      drizzled/statistics_variables.h \
1285 by Brian Aker
Remove giant include header to its own file.
421
			      drizzled/table_proto.h \
422
			      drizzled/table_reference.h \
1532.1.14 by Brian Aker
We no longer use alloc for placeholders (due to HASH I didn't use a
423
			      drizzled/table_placeholder.h \
1285 by Brian Aker
Remove giant include header to its own file.
424
			      drizzled/table_share.h \
1532.1.1 by Brian Aker
Merge of change to flip table instance to be share instance
425
			      drizzled/table_share_instance.h \
1285 by Brian Aker
Remove giant include header to its own file.
426
			      drizzled/temporal.h \
427
			      drizzled/temporal_format.h \
428
			      drizzled/temporal_interval.h \
429
			      drizzled/thr_lock.h \
430
			      drizzled/time_functions.h \
431
			      drizzled/tmp_table_param.h \
1471.3.2 by Monty Taylor
Merged in old drizzled-as-lib patch.
432
			      drizzled/transaction_context.h \
1285 by Brian Aker
Remove giant include header to its own file.
433
			      drizzled/transaction_services.h \
1471.3.2 by Monty Taylor
Merged in old drizzled-as-lib patch.
434
			      drizzled/tree.h \
435
			      drizzled/typelib.h \
1285 by Brian Aker
Remove giant include header to its own file.
436
			      drizzled/tzfile.h \
437
			      drizzled/tztime.h \
438
			      drizzled/unique.h \
439
			      drizzled/unireg.h \
440
			      drizzled/user_var_entry.h \
1567.3.20 by Monty Taylor
Removed UTF-8 lib that we don't use.
441
			      drizzled/utf8/utf8.h \
1471.3.2 by Monty Taylor
Merged in old drizzled-as-lib patch.
442
			      drizzled/var.h \
1285 by Brian Aker
Remove giant include header to its own file.
443
			      drizzled/version.h \
444
			      drizzled/visibility.h \
1314.2.1 by Monty Taylor
Moved reference to innodb plugin header to innodb plugin where it should be.
445
			      drizzled/xid.h
997.2.19 by Monty Taylor
Reverted back to building drizzled in drizzled.
446
1509.1.1 by Monty Taylor
Undid the libdrizzled.so.
447
drizzled_drizzled_LDFLAGS= -export-dynamic
448
drizzled_drizzled_LDADD= \
1300.5.2 by Monty Taylor
Changed build to build the almost all of drizzle into libdrizzled and then
449
				drizzled/algorithm/libhash.la \
450
				drizzled/util/libutil.la \
1300.5.21 by Monty Taylor
Fixed indent.
451
				drizzled/internal/libinternal.la \
452
				drizzled/message/libdrizzledmessage.la \
1491.6.4 by Monty Taylor
Fixed to work without libdrizzled.la.
453
				drizzled/libtemporal.la \
1300.5.21 by Monty Taylor
Fixed indent.
454
				$(LIBZ) \
455
				$(LIBINTL) \
456
				${LIBC_P} \
457
				$(pandora_plugin_libs) \
1300.5.23 by Monty Taylor
Merged in revs removing depend on the plugin tree.
458
				$(LDADD) \
459
				$(LIBUUID) \
460
				$(LIBDL_LIBS) \
461
				$(LIBPCRE) \
1608.4.2 by Monty Taylor
Added back direct link of libprotobuf. Fedora13 apparently wants this during
462
				$(LTLIBPROTOBUF) \
1300.5.23 by Monty Taylor
Merged in revs removing depend on the plugin tree.
463
				$(LIBTBB) \
1625.1.2 by Monty Taylor
Added option_context class, along with unittests, for adding a module
464
				$(BOOST_LIBS) \
1300.5.21 by Monty Taylor
Fixed indent.
465
				$(GCOV_LIBS) 
1300.5.2 by Monty Taylor
Changed build to build the almost all of drizzle into libdrizzled and then
466
1509.1.1 by Monty Taylor
Undid the libdrizzled.so.
467
drizzled_drizzled_DEPENDENCIES= \
1300.5.4 by Monty Taylor
Fixed the link on RHEL/CentOS
468
                                      drizzled/message/libdrizzledmessage.la \
469
                                      ${noinst_LTLIBRARIES} \
470
                                      $(pandora_plugin_libs)
1300.5.2 by Monty Taylor
Changed build to build the almost all of drizzle into libdrizzled and then
471
1509.1.1 by Monty Taylor
Undid the libdrizzled.so.
472
drizzled_drizzled_SOURCES= \
473
                           drizzled/main.cc \
1300.5.2 by Monty Taylor
Changed build to build the almost all of drizzle into libdrizzled and then
474
				 drizzled/alter_info.cc \
475
				 drizzled/cached_item.cc \
476
				 drizzled/check_stack_overrun.cc \
477
				 drizzled/comp_creator.cc \
478
				 drizzled/create_field.cc \
479
				 drizzled/current_session.cc \
480
				 drizzled/cursor.cc \
481
				 drizzled/decimal.cc \
482
				 drizzled/diagnostics_area.cc \
1471.3.2 by Monty Taylor
Merged in old drizzled-as-lib patch.
483
				 drizzled/drizzle_time.cc \
1300.5.10 by Monty Taylor
Fixed merge oops.
484
				 drizzled/drizzled.cc \
1300.5.2 by Monty Taylor
Changed build to build the almost all of drizzle into libdrizzled and then
485
				 drizzled/dtcollation.cc \
486
				 drizzled/errmsg_print.cc \
487
				 drizzled/field.cc \
488
				 drizzled/field/blob.cc \
489
				 drizzled/field/date.cc \
490
				 drizzled/field/datetime.cc \
491
				 drizzled/field/decimal.cc \
492
				 drizzled/field/double.cc \
493
				 drizzled/field/enum.cc \
494
				 drizzled/field/int64_t.cc \
495
				 drizzled/field/long.cc \
496
				 drizzled/field/null.cc \
497
				 drizzled/field/num.cc \
498
				 drizzled/field/real.cc \
499
				 drizzled/field/str.cc \
500
				 drizzled/field/timestamp.cc \
501
				 drizzled/field/varstring.cc \
502
				 drizzled/field_conv.cc \
503
				 drizzled/field_iterator.cc \
504
				 drizzled/file_exchange.cc \
505
				 drizzled/filesort.cc \
506
				 drizzled/foreign_key.cc \
507
				 drizzled/function/additive_op.cc \
508
				 drizzled/function/field.cc \
509
				 drizzled/function/find_in_set.cc \
510
				 drizzled/function/found_rows.cc \
511
				 drizzled/function/func.cc \
512
				 drizzled/function/get_system_var.cc \
513
				 drizzled/function/get_user_var.cc \
514
				 drizzled/function/last_insert.cc \
515
				 drizzled/function/locate.cc \
516
				 drizzled/function/math/abs.cc \
517
				 drizzled/function/math/acos.cc \
518
				 drizzled/function/math/asin.cc \
519
				 drizzled/function/math/atan.cc \
520
				 drizzled/function/math/ceiling.cc \
521
				 drizzled/function/math/cos.cc \
522
				 drizzled/function/math/decimal_typecast.cc \
523
				 drizzled/function/math/divide.cc \
524
				 drizzled/function/math/exp.cc \
525
				 drizzled/function/math/floor.cc \
526
				 drizzled/function/math/int.cc \
527
				 drizzled/function/math/int_divide.cc \
528
				 drizzled/function/math/int_val.cc \
529
				 drizzled/function/math/integer.cc \
530
				 drizzled/function/math/ln.cc \
531
				 drizzled/function/math/log.cc \
532
				 drizzled/function/math/minus.cc \
533
				 drizzled/function/math/mod.cc \
534
				 drizzled/function/math/multiply.cc \
535
				 drizzled/function/math/neg.cc \
536
				 drizzled/function/math/ord.cc \
537
				 drizzled/function/math/plus.cc \
538
				 drizzled/function/math/pow.cc \
539
				 drizzled/function/math/real.cc \
540
				 drizzled/function/math/round.cc \
541
				 drizzled/function/math/sin.cc \
542
				 drizzled/function/math/sqrt.cc \
543
				 drizzled/function/math/tan.cc \
544
				 drizzled/function/min_max.cc \
545
				 drizzled/function/num1.cc \
546
				 drizzled/function/num_op.cc \
547
				 drizzled/function/numhybrid.cc \
548
				 drizzled/function/row_count.cc \
549
				 drizzled/function/set_user_var.cc \
550
				 drizzled/function/sign.cc \
551
				 drizzled/function/str/alloc_buffer.cc \
552
				 drizzled/function/str/binary.cc \
553
				 drizzled/function/str/char.cc \
554
				 drizzled/function/str/collation.cc \
555
				 drizzled/function/str/concat.cc \
556
				 drizzled/function/str/conv.cc \
557
				 drizzled/function/str/conv_charset.cc \
558
				 drizzled/function/str/elt.cc \
559
				 drizzled/function/str/export_set.cc \
560
				 drizzled/function/str/format.cc \
561
				 drizzled/function/str/insert.cc \
562
				 drizzled/function/str/left.cc \
563
				 drizzled/function/str/load_file.cc \
564
				 drizzled/function/str/make_set.cc \
565
				 drizzled/function/str/pad.cc \
566
				 drizzled/function/str/quote.cc \
567
				 drizzled/function/str/repeat.cc \
568
				 drizzled/function/str/replace.cc \
569
				 drizzled/function/str/right.cc \
570
				 drizzled/function/str/set_collation.cc \
571
				 drizzled/function/str/str_conv.cc \
572
				 drizzled/function/str/strfunc.cc \
573
				 drizzled/function/str/trim.cc \
574
				 drizzled/function/time/curdate.cc \
575
				 drizzled/function/time/date.cc \
576
				 drizzled/function/time/date_add_interval.cc \
577
				 drizzled/function/time/date_format.cc \
578
				 drizzled/function/time/dayname.cc \
579
				 drizzled/function/time/dayofmonth.cc \
580
				 drizzled/function/time/dayofyear.cc \
581
				 drizzled/function/time/extract.cc \
582
				 drizzled/function/time/from_days.cc \
583
				 drizzled/function/time/from_unixtime.cc \
584
				 drizzled/function/time/hour.cc \
585
				 drizzled/function/time/last_day.cc \
586
				 drizzled/function/time/makedate.cc \
587
				 drizzled/function/time/microsecond.cc \
588
				 drizzled/function/time/minute.cc \
589
				 drizzled/function/time/month.cc \
590
				 drizzled/function/time/now.cc \
591
				 drizzled/function/time/period_add.cc \
592
				 drizzled/function/time/period_diff.cc \
593
				 drizzled/function/time/quarter.cc \
594
				 drizzled/function/time/second.cc \
595
				 drizzled/function/time/sysdate_local.cc \
596
				 drizzled/function/time/timestamp_diff.cc \
597
				 drizzled/function/time/to_days.cc \
598
				 drizzled/function/time/typecast.cc \
599
				 drizzled/function/time/unix_timestamp.cc \
600
				 drizzled/function/time/weekday.cc \
601
				 drizzled/function/time/year.cc \
602
				 drizzled/function/units.cc \
603
				 drizzled/function/user_var_as_out_param.cc \
1643.3.7 by Brian Aker
Adding columns.
604
				 drizzled/generator/all_fields.cc \
1643.3.5 by Brian Aker
Addd an "all_tables" generator to loop through all tables.
605
				 drizzled/generator/all_tables.cc \
1643.3.4 by Brian Aker
Moved generators out of trunk of server.
606
				 drizzled/generator/schema.cc \
607
				 drizzled/generator/table.cc \
1300.5.2 by Monty Taylor
Changed build to build the almost all of drizzle into libdrizzled and then
608
				 drizzled/ha_commands.cc \
609
				 drizzled/hybrid_type_traits.cc \
610
				 drizzled/hybrid_type_traits_decimal.cc \
611
				 drizzled/hybrid_type_traits_integer.cc \
1660.1.1 by Brian Aker
Merge in move identifier work.
612
				 drizzled/identifier/schema.cc \
613
				 drizzled/identifier/table.cc \
1300.5.2 by Monty Taylor
Changed build to build the almost all of drizzle into libdrizzled and then
614
				 drizzled/index_hint.cc \
615
				 drizzled/item.cc \
616
				 drizzled/item/bin_string.cc \
617
				 drizzled/item/cache.cc \
618
				 drizzled/item/cache_decimal.cc \
619
				 drizzled/item/cache_int.cc \
620
				 drizzled/item/cache_real.cc \
621
				 drizzled/item/cache_row.cc \
622
				 drizzled/item/cache_str.cc \
623
				 drizzled/item/cmpfunc.cc \
624
				 drizzled/item/copy_string.cc \
625
				 drizzled/item/create.cc \
626
				 drizzled/item/decimal.cc \
627
				 drizzled/item/default_value.cc \
628
				 drizzled/item/direct_ref.cc \
629
				 drizzled/item/empty_string.cc \
630
				 drizzled/item/field.cc \
631
				 drizzled/item/float.cc \
632
				 drizzled/item/hex_string.cc \
633
				 drizzled/item/ident.cc \
634
				 drizzled/item/insert_value.cc \
635
				 drizzled/item/int.cc \
636
				 drizzled/item/int_with_ref.cc \
637
				 drizzled/item/null.cc \
638
				 drizzled/item/num.cc \
639
				 drizzled/item/outer_ref.cc \
640
				 drizzled/item/ref.cc \
641
				 drizzled/item/ref_null_helper.cc \
642
				 drizzled/item/row.cc \
643
				 drizzled/item/string.cc \
644
				 drizzled/item/subselect.cc \
645
				 drizzled/item/sum.cc \
646
				 drizzled/item/type_holder.cc \
647
				 drizzled/item/uint.cc \
648
				 drizzled/join.cc \
649
				 drizzled/join_cache.cc \
650
				 drizzled/join_table.cc \
651
				 drizzled/key.cc \
652
				 drizzled/key_map.cc \
653
				 drizzled/lock.cc \
654
				 drizzled/lookup_symbol.cc \
1626.2.1 by Monty Taylor
Added wrapper around variables_map to allow us to pull values back out of
655
				 drizzled/module/context.cc \
1530.2.5 by Monty Taylor
Renamed classes that were in drizzled::plugin but which were not meant
656
				 drizzled/module/library.cc \
657
				 drizzled/module/loader.cc \
1625.1.2 by Monty Taylor
Added option_context class, along with unittests, for adding a module
658
				 drizzled/module/option_context.cc \
1626.2.1 by Monty Taylor
Added wrapper around variables_map to allow us to pull values back out of
659
				 drizzled/module/option_map.cc \
1530.2.5 by Monty Taylor
Renamed classes that were in drizzled::plugin but which were not meant
660
				 drizzled/module/registry.cc \
1300.5.2 by Monty Taylor
Changed build to build the almost all of drizzle into libdrizzled and then
661
				 drizzled/my_getsystime.cc \
662
				 drizzled/my_hash.cc \
663
				 drizzled/name_resolution_context_state.cc \
664
				 drizzled/natural_join_column.cc \
1497.1.1 by Monty Taylor
Merged up with build.
665
				 drizzled/optimizer/access_method/const.cc \
666
				 drizzled/optimizer/access_method/index.cc \
667
				 drizzled/optimizer/access_method/scan.cc \
668
				 drizzled/optimizer/access_method/system.cc \
669
				 drizzled/optimizer/access_method/unique_index.cc \
670
				 drizzled/optimizer/access_method_factory.cc \
1300.5.2 by Monty Taylor
Changed build to build the almost all of drizzle into libdrizzled and then
671
				 drizzled/optimizer/explain_plan.cc \
672
				 drizzled/optimizer/key_field.cc \
673
				 drizzled/optimizer/quick_group_min_max_select.cc \
674
				 drizzled/optimizer/quick_index_merge_select.cc \
675
				 drizzled/optimizer/quick_range.cc \
676
				 drizzled/optimizer/quick_range_select.cc \
677
				 drizzled/optimizer/quick_ror_intersect_select.cc \
678
				 drizzled/optimizer/quick_ror_union_select.cc \
679
				 drizzled/optimizer/range.cc \
680
				 drizzled/optimizer/sel_arg.cc \
1300.5.18 by Monty Taylor
Fixed the merge.
681
				 drizzled/optimizer/sel_imerge.cc \
682
				 drizzled/optimizer/sel_tree.cc \
1300.5.2 by Monty Taylor
Changed build to build the almost all of drizzle into libdrizzled and then
683
				 drizzled/optimizer/sum.cc \
684
				 drizzled/plugin/authentication.cc \
1300.5.18 by Monty Taylor
Fixed the merge.
685
				 drizzled/plugin/authorization.cc \
1300.5.2 by Monty Taylor
Changed build to build the almost all of drizzle into libdrizzled and then
686
				 drizzled/plugin/client.cc \
687
				 drizzled/plugin/error_message.cc \
1502.5.7 by Barry.Leslie at PrimeBase
Renamed the 'Event' plugin to 'EventObserver' plugin along with some internal class renames to make things clearer.
688
				 drizzled/plugin/event_observer.cc  \
1300.5.2 by Monty Taylor
Changed build to build the almost all of drizzle into libdrizzled and then
689
				 drizzled/plugin/function.cc \
690
				 drizzled/plugin/listen.cc \
691
				 drizzled/plugin/listen_tcp.cc \
692
				 drizzled/plugin/logging.cc \
1300.5.18 by Monty Taylor
Fixed the merge.
693
				 drizzled/plugin/monitored_in_transaction.cc \
1300.5.2 by Monty Taylor
Changed build to build the almost all of drizzle into libdrizzled and then
694
				 drizzled/plugin/plugin.cc \
695
				 drizzled/plugin/query_cache.cc \
1300.5.11 by Monty Taylor
Merged in trunk.
696
				 drizzled/plugin/query_rewrite.cc \
1300.5.2 by Monty Taylor
Changed build to build the almost all of drizzle into libdrizzled and then
697
				 drizzled/plugin/scheduler.cc \
1300.5.24 by Monty Taylor
Merged trunk and use-std-unordred.
698
				 drizzled/plugin/schema_engine.cc \
1300.5.2 by Monty Taylor
Changed build to build the almost all of drizzle into libdrizzled and then
699
				 drizzled/plugin/storage_engine.cc \
700
				 drizzled/plugin/table_function.cc \
701
				 drizzled/plugin/transaction_applier.cc \
702
				 drizzled/plugin/transaction_replicator.cc \
1300.5.9 by Monty Taylor
Merged trunk.
703
				 drizzled/plugin/transactional_storage_engine.cc \
1471.3.2 by Monty Taylor
Merged in old drizzled-as-lib patch.
704
				 drizzled/plugin/xa_resource_manager.cc \
1300.5.9 by Monty Taylor
Merged trunk.
705
				 drizzled/plugin/xa_storage_engine.cc \
1300.5.2 by Monty Taylor
Changed build to build the almost all of drizzle into libdrizzled and then
706
				 drizzled/query_id.cc \
707
				 drizzled/records.cc \
708
				 drizzled/replication_services.cc \
1300.5.9 by Monty Taylor
Merged trunk.
709
				 drizzled/resource_context.cc \
1300.5.2 by Monty Taylor
Changed build to build the almost all of drizzle into libdrizzled and then
710
				 drizzled/session.cc \
711
				 drizzled/session_list.cc \
712
				 drizzled/set_var.cc \
713
				 drizzled/show.cc \
714
				 drizzled/signal_handler.cc \
715
				 drizzled/sql_base.cc \
716
				 drizzled/sql_bitmap.cc \
717
				 drizzled/sql_delete.cc \
718
				 drizzled/sql_derived.cc \
719
				 drizzled/sql_error.cc \
720
				 drizzled/sql_insert.cc \
721
				 drizzled/sql_lex.cc \
722
				 drizzled/sql_list.cc \
723
				 drizzled/sql_load.cc \
724
				 drizzled/sql_locale.cc \
725
				 drizzled/sql_parse.cc \
726
				 drizzled/sql_select.cc \
727
				 drizzled/sql_state.cc \
728
				 drizzled/sql_string.cc \
729
				 drizzled/sql_table.cc \
730
				 drizzled/sql_union.cc \
731
				 drizzled/sql_update.cc \
732
				 drizzled/sql_yacc.yy \
733
				 drizzled/statement/alter_schema.cc \
734
				 drizzled/statement/alter_table.cc \
735
				 drizzled/statement/analyze.cc \
736
				 drizzled/statement/change_schema.cc \
737
				 drizzled/statement/check.cc \
738
				 drizzled/statement/commit.cc \
739
				 drizzled/statement/create_index.cc \
740
				 drizzled/statement/create_schema.cc \
741
				 drizzled/statement/create_table.cc \
742
				 drizzled/statement/delete.cc \
743
				 drizzled/statement/drop_index.cc \
744
				 drizzled/statement/drop_schema.cc \
745
				 drizzled/statement/drop_table.cc \
746
				 drizzled/statement/empty_query.cc \
747
				 drizzled/statement/flush.cc \
748
				 drizzled/statement/insert.cc \
749
				 drizzled/statement/insert_select.cc \
750
				 drizzled/statement/kill.cc \
751
				 drizzled/statement/load.cc \
752
				 drizzled/statement/release_savepoint.cc \
753
				 drizzled/statement/rename_table.cc \
754
				 drizzled/statement/replace.cc \
755
				 drizzled/statement/replace_select.cc \
756
				 drizzled/statement/rollback.cc \
757
				 drizzled/statement/rollback_to_savepoint.cc \
758
				 drizzled/statement/savepoint.cc \
759
				 drizzled/statement/select.cc \
760
				 drizzled/statement/set_option.cc \
761
				 drizzled/statement/show_create.cc \
762
				 drizzled/statement/show_create_schema.cc \
763
				 drizzled/statement/show_errors.cc \
764
				 drizzled/statement/show_warnings.cc \
765
				 drizzled/statement/start_transaction.cc \
766
				 drizzled/statement/truncate.cc \
767
				 drizzled/statement/unlock_tables.cc \
768
				 drizzled/statement/update.cc \
1561.3.19 by Joe Daly
move GPL code back to the core from logging_stats plugin
769
				 drizzled/status_helper.cc \
1300.5.2 by Monty Taylor
Changed build to build the almost all of drizzle into libdrizzled and then
770
				 drizzled/strfunc.cc \
771
				 drizzled/table.cc \
772
				 drizzled/table_function_container.cc \
773
				 drizzled/table_list.cc \
774
				 drizzled/table_share.cc \
775
				 drizzled/thr_lock.cc \
776
				 drizzled/time_functions.cc \
777
				 drizzled/transaction_services.cc \
1471.3.2 by Monty Taylor
Merged in old drizzled-as-lib patch.
778
				 drizzled/tree.cc \
1300.5.2 by Monty Taylor
Changed build to build the almost all of drizzle into libdrizzled and then
779
				 drizzled/tztime.cc \
780
				 drizzled/uniques.cc \
781
				 drizzled/user_var_entry.cc \
782
				 drizzled/version.cc \
783
				 drizzled/xid.cc
784
785
sbin_PROGRAMS+= drizzled/drizzled
786
1285 by Brian Aker
Remove giant include header to its own file.
787
noinst_LTLIBRARIES+= \
788
		     drizzled/libcached_directory.la \
789
		     drizzled/libcharset.la \
790
		     drizzled/libdynamic_array.la \
791
		     drizzled/liberror.la \
792
		     drizzled/libgetopt.la \
793
		     drizzled/libmemory.la \
794
		     drizzled/libserialutil.la \
1491.6.4 by Monty Taylor
Fixed to work without libdrizzled.la.
795
		     drizzled/libtemporal.la \
1285 by Brian Aker
Remove giant include header to its own file.
796
		     drizzled/libtypelib.la
797
798
drizzled_libcharset_la_SOURCES= \
799
				drizzled/charset-def.cc \
800
				drizzled/charset.cc \
801
				drizzled/ctype-bin.cc \
802
				drizzled/ctype-mb.cc \
803
				drizzled/ctype-simple.cc \
804
				drizzled/ctype-uca.cc \
805
				drizzled/ctype-uni.cc \
806
				drizzled/ctype-utf8.cc \
807
				drizzled/ctype.cc
1280.1.10 by Monty Taylor
Put everything in drizzled into drizzled namespace.
808
1241.9.57 by Monty Taylor
Oy. Bigger change than I normally like - but this stuff is all intertwined.
809
drizzled_libdynamic_array_la_SOURCES = drizzled/dynamic_array.cc
1271.5.4 by Tim Penhey
Make it compile.
810
drizzled_liberror_la_SOURCES = drizzled/error.cc
1410.3.4 by Djellel E. Difallah
update references to old my_'s
811
drizzled_libgetopt_la_SOURCES = drizzled/option.cc
1491.6.4 by Monty Taylor
Fixed to work without libdrizzled.la.
812
drizzled_libtemporal_la_SOURCES= \
813
				 drizzled/calendar.cc \
814
				 drizzled/temporal.cc \
815
				 drizzled/temporal_format.cc \
816
				 drizzled/temporal_interval.cc
1241.9.57 by Monty Taylor
Oy. Bigger change than I normally like - but this stuff is all intertwined.
817
drizzled_libtypelib_la_SOURCES = drizzled/typelib.cc
1192.3.55 by Robert Collins
Merged from Robert: changed subdir make files to be included makefiles.
818
drizzled_libserialutil_la_SOURCES = drizzled/db.cc drizzled/table_proto_write.cc
819
drizzled_libserialutil_la_CXXFLAGS= ${AM_CXXFLAGS} ${PROTOSKIP_WARNINGS}
820
1241.9.56 by Monty Taylor
More mysys cleaning.
821
drizzled_libcached_directory_la_SOURCES=drizzled/cached_directory.cc
822
drizzled_libmemory_la_SOURCES= \
1285 by Brian Aker
Remove giant include header to its own file.
823
			       drizzled/memory/multi_malloc.cc \
824
			       drizzled/memory/root.cc \
825
			       drizzled/memory/sql_alloc.cc
1241.9.56 by Monty Taylor
More mysys cleaning.
826
779.4.10 by Monty Taylor
Cleaned up a few build things. Thank me... builds should be quicker now. :)
827
AM_YFLAGS = -p DRIZZLE -d --verbose
670.4.1 by Monty Taylor
Removed recursive subdirs in drizzled/, which allowed the renaming of ifloat and istring. It's also faster.
828
829
997.2.19 by Monty Taylor
Reverted back to building drizzled in drizzled.
830
if BUILD_GCC_PCH
1285 by Brian Aker
Remove giant include header to its own file.
831
PCHHEADERS= \
832
	    drizzled/definitions.h.gch \
833
	    drizzled/plugin/storage_engine.h.gch  \
834
	    drizzled/sql_base.h.gch \
835
	    drizzled/sql_parse.h.gch
492.1.7 by Monty Taylor
Moved test() to its own file.
836
else
575.1.6 by Monty Taylor
Cleaned up some headers for PCH.
837
PCHHEADERS = 
492.1.7 by Monty Taylor
Moved test() to its own file.
838
endif
839
1285 by Brian Aker
Remove giant include header to its own file.
840
BUILT_MAINT_SRC= \
841
		 drizzled/sql_yacc.cc \
842
		 drizzled/sql_yacc.h
187 by Brian Aker
Fixed tab issue
843
1285 by Brian Aker
Remove giant include header to its own file.
844
BUILT_SOURCES+= \
845
		$(BUILT_MAINT_SRC) \
1192.3.55 by Robert Collins
Merged from Robert: changed subdir make files to be included makefiles.
846
		drizzled/symbol_hash.h \
847
		drizzled/function_hash.h \
1126.10.23 by Padraig O'Sullivan
Added a new header file to be included by files which want to insert dtrace
848
		$(PCHHEADERS) 
849
1285 by Brian Aker
Remove giant include header to its own file.
850
EXTRA_DIST+= \
851
	     $(BUILT_MAINT_SRC) \
852
	     drizzled/symbol_hash.gperf \
853
	     drizzled/function_hash.gperf \
854
	     drizzled/message.mc \
855
	     drizzled/probes.d
187 by Brian Aker
Fixed tab issue
856
1285 by Brian Aker
Remove giant include header to its own file.
857
CLEANFILES+= \
858
	     drizzled/configmake.h \
859
	     drizzled/function_hash.h \
860
	     drizzled/function_hash.stamp-h \
861
	     drizzled/sql_yacc.output \
862
	     drizzled/symbol_hash.h \
863
	     drizzled/symbol_hash.stamp-h \
864
	     drizzled/plugin/config.h \
865
	     $(PCHHEADERS) \
866
	     $(nodist_drizzled_SOURCES)
187 by Brian Aker
Fixed tab issue
867
1126.11.1 by Trond Norbye
Fix compilation with --enable-dtrace on MacOSX
868
if DTRACE_NEEDS_OBJECTS
1297 by Brian Aker
Fix style issue.
869
drizzled_drizzled_SOURCES+= drizzled/probes.d
1126.11.1 by Trond Norbye
Fix compilation with --enable-dtrace on MacOSX
870
endif
871
1126.10.24 by Padraig O'Sullivan
Updated the char * arguments to the dtrace probes to be const and also added
872
if HAVE_DTRACE
1297 by Brian Aker
Fix style issue.
873
BUILT_SOURCES+= drizzled/generated_probes.h
874
CLEANFILES+= drizzled/generated_probes.h
1126.10.24 by Padraig O'Sullivan
Updated the char * arguments to the dtrace probes to be const and also added
875
endif
876
877
1297 by Brian Aker
Fix style issue.
878
DISTCLEANFILES+= \
879
		 $(EXTRA_PROGRAMS) \
187 by Brian Aker
Fixed tab issue
880
		 $(BUILT_MAINT_SRC)
881
1297 by Brian Aker
Fix style issue.
882
MAINTAINERCLEANFILES+= $(BUILT_MAINT_SRC)
187 by Brian Aker
Fixed tab issue
883
1241.7.1 by Padraig O'Sullivan
DTrace probes are now generated again. Fixes compilation error when dtrace is enabled.
884
drizzled/generated_probes.h : drizzled/probes.d
1497.3.6 by Monty Taylor
Fixed dtrace in vpath build.
885
	$(DTRACE) $(DTRACEFLAGS) -h -s ${top_srcdir}/drizzled/probes.d -o drizzled/generated_probes.h
1192.3.55 by Robert Collins
Merged from Robert: changed subdir make files to be included makefiles.
886
	mv drizzled/generated_probes.h drizzled/generated_probes.h.bak
1241.7.1 by Padraig O'Sullivan
DTrace probes are now generated again. Fixes compilation error when dtrace is enabled.
887
	sed "s/#include <unistd.h>//g" drizzled/generated_probes.h.bak > drizzled/generated_probes.h
1192.3.55 by Robert Collins
Merged from Robert: changed subdir make files to be included makefiles.
888
	rm drizzled/generated_probes.h.bak
889
	sed -e 's,void \*,const void \*,g' drizzled/generated_probes.h | \
1126.10.24 by Padraig O'Sullivan
Updated the char * arguments to the dtrace probes to be const and also added
890
		sed -e 's,char \*,const char \*,g' | tr '\t' ' ' > dtrace_probes.tmp
1192.3.55 by Robert Collins
Merged from Robert: changed subdir make files to be included makefiles.
891
	mv dtrace_probes.tmp drizzled/generated_probes.h
892
893
1297 by Brian Aker
Fix style issue.
894
SUFFIXES+= .d .gch .gperf .stamp-h
722.1.1 by Monty Taylor
Removed Gnu-Make-isms, since there were only two and we really don't need them and I'm sick of having make break when I accidentally type "make" (silly me) on Solaris.
895
997.2.19 by Monty Taylor
Reverted back to building drizzled in drizzled.
896
if BUILD_GCC_PCH
722.1.1 by Monty Taylor
Removed Gnu-Make-isms, since there were only two and we really don't need them and I'm sick of having make break when I accidentally type "make" (silly me) on Solaris.
897
.h.gch:
670.4.1 by Monty Taylor
Removed recursive subdirs in drizzled/, which allowed the renaming of ifloat and istring. It's also faster.
898
	$(CXXCOMPILE) -include config.h ${NO_UNUSED_MACROS} -c $<
492.1.7 by Monty Taylor
Moved test() to its own file.
899
endif
900
1259.7.3 by Monty Taylor
Fixed dtrace build.
901
drizzled/probes.o :  drizzled/probes.d $(DTRACEFILES) config.h
902
903
.d.o:
904
	$(DTRACE) $(DTRACEFLAGS) -o $@ -G -s $< $(DTRACEFILES)
779.4.5 by Monty Taylor
Replaced gen_lex_hash with gperf. Yay for no more building tools to build source!!!
905
1192.3.55 by Robert Collins
Merged from Robert: changed subdir make files to be included makefiles.
906
drizzled/function_hash.h: drizzled/function_hash.stamp-h
907
drizzled/symbol_hash.h: drizzled/symbol_hash.stamp-h
779.4.5 by Monty Taylor
Replaced gen_lex_hash with gperf. Yay for no more building tools to build source!!!
908
779.7.6 by Monty Taylor
Generalized gperf building. Feel free to just add .gperf files now.
909
.gperf.stamp-h:
1099.2.1 by rm
get things compiling on FreeBSD (7.1)
910
	$(GPERF) -D --initializer-suffix=,0 --struct-type --enum \
779.4.5 by Monty Taylor
Replaced gen_lex_hash with gperf. Yay for no more building tools to build source!!!
911
		--omit-struct-type --readonly-tables --language=C++ \
1192.3.55 by Robert Collins
Merged from Robert: changed subdir make files to be included makefiles.
912
		--class-name=$(*F) $<  > $@
873.2.23 by Monty Taylor
Fixed a failure during gperf failure.
913
	@if ! test $$? ; then rm $@ ; fi
914
	@if test -f $@ ; then \
915
		if ! diff $@ \
1192.3.55 by Robert Collins
Merged from Robert: changed subdir make files to be included makefiles.
916
			   ${top_builddir}/$*.h >/dev/null 2>&1 ; \
873.2.23 by Monty Taylor
Fixed a failure during gperf failure.
917
		then \
1192.3.55 by Robert Collins
Merged from Robert: changed subdir make files to be included makefiles.
918
			cp $@ ${top_builddir}/$*.h ; \
873.2.23 by Monty Taylor
Fixed a failure during gperf failure.
919
		fi \
779.4.5 by Monty Taylor
Replaced gen_lex_hash with gperf. Yay for no more building tools to build source!!!
920
	fi
921