← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/include.am

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/include.am
40
40
                drizzled/atomic/sun_studio.h \
41
41
                drizzled/atomics.h \
42
42
                drizzled/base.h \
 
43
                drizzled/cached_directory.h \
43
44
                drizzled/cached_item.h \
44
45
                drizzled/calendar.h \
 
46
                drizzled/charset.h \
 
47
                drizzled/charset_info.h \
45
48
                drizzled/check_stack_overrun.h \
46
49
                drizzled/common.h \
47
50
                drizzled/comp_creator.h \
50
53
                drizzled/current_session.h \
51
54
                drizzled/data_home.h \
52
55
                drizzled/db.h \
 
56
                drizzled/decimal.h \
53
57
                drizzled/definitions.h \
54
58
                drizzled/diagnostics_area.h \
55
59
                drizzled/discrete_interval.h \
56
60
                drizzled/dtcollation.h \
 
61
                drizzled/dynamic_array.h \
57
62
                drizzled/enum.h \
58
63
                drizzled/enum_nested_loop_state.h \
59
64
                drizzled/errmsg_print.h \
183
188
                drizzled/function/time/unix_timestamp.h \
184
189
                drizzled/function/time/weekday.h \
185
190
                drizzled/function/time/year.h  \
 
191
                drizzled/typelib.h \
186
192
                drizzled/function/units.h \
187
193
                drizzled/function/user_var_as_out_param.h \
188
194
                drizzled/function_hash.h \
251
257
                drizzled/lock.h \
252
258
                drizzled/lookup_symbol.h \
253
259
                drizzled/memory/multi_malloc.h \
254
 
                drizzled/my_decimal.h\
 
260
                drizzled/memory/root.h \
 
261
                drizzled/my_decimal.h \
 
262
                drizzled/my_error.h \
 
263
                drizzled/my_getopt.h \
 
264
                drizzled/my_hash.h \
 
265
                drizzled/my_time.h \
 
266
                drizzled/my_tree.h \
255
267
                drizzled/my_var.h \
256
268
                drizzled/name_resolution_context.h \
257
269
                drizzled/name_resolution_context_state.h \
298
310
                drizzled/plugin/transaction_replicator.h \
299
311
                drizzled/pthread_globals.h \
300
312
                drizzled/probes.h \
 
313
                drizzled/qsort_cmp.h \
301
314
                drizzled/query_id.h \
302
315
                drizzled/records.h \
303
316
                drizzled/replication_services.h \
321
334
                drizzled/set_var.h \
322
335
                drizzled/show.h \
323
336
                drizzled/sql_alloc.h \
324
 
                drizzled/sql_array.h \
325
337
                drizzled/sql_base.h \
326
338
                drizzled/sql_bitmap.h \
327
339
                drizzled/sql_error.h \
392
404
                drizzled/temporal.h \
393
405
                drizzled/temporal_format.h \
394
406
                drizzled/temporal_interval.h \
 
407
                drizzled/thr_lock.h \
395
408
                drizzled/time_functions.h \
396
409
                drizzled/tmp_table_param.h \
397
410
                drizzled/tzfile.h \
407
420
                drizzled/visibility.h \
408
421
                drizzled/xid.h
409
422
 
410
 
noinst_LTLIBRARIES += \
411
 
                drizzled/libhandler.la \
412
 
                drizzled/libserialutil.la
413
 
 
414
 
LDADD = $(top_builddir)/mysys/libmysys.la \
415
 
        $(top_builddir)/mystrings/libmystrings.la \
416
 
        $(LTLIBDRIZZLE) $(LIBZ) $(LIBINTL) ${LIBC_P}
417
 
 
418
 
drizzled_drizzled_LDADD = ${noinst_LTLIBRARIES} \
419
 
                 $(top_builddir)/drizzled/hash/libhash.la \
420
 
                 $(top_builddir)/drizzled/util/libutil.la \
421
 
                 $(top_builddir)/drizzled/message/libdrizzledmessage.la \
422
 
                 $(pandora_plugin_libs) \
423
 
                 $(LDADD) $(LIBUUID) ${top_builddir}/gnulib/libgnu.la \
424
 
                 $(LIBDL_LIBS) $(LIBPROTOBUF) $(LIBPCRE) $(LIBTBB) \
425
 
                 $(PANDORA_PLUGIN_DEP_LIBS) $(GCOV_LIBS) 
 
423
DRIZZLED_LDADD= \
 
424
                 drizzled/internal/libinternal.la \
 
425
                $(LTLIBDRIZZLE) $(LIBZ) $(LIBINTL) ${LIBC_P}
 
426
 
 
427
drizzled_drizzled_LDADD= \
 
428
                ${DRIZZLED_LDADD} \
 
429
                ${noinst_LTLIBRARIES} \
 
430
                drizzled/hash/libhash.la \
 
431
                drizzled/util/libutil.la \
 
432
                drizzled/message/libdrizzledmessage.la \
 
433
                drizzled/libcached_directory.la \
 
434
                drizzled/liberror.la \
 
435
                drizzled/libmemory.la \
 
436
                $(pandora_plugin_libs) \
 
437
                $(LDADD) $(LIBUUID) gnulib/libgnu.la \
 
438
                $(LIBDL_LIBS) $(LIBPROTOBUF) $(LIBPCRE) $(LIBTBB) \
 
439
                $(PANDORA_PLUGIN_DEP_LIBS) $(GCOV_LIBS) 
426
440
 
427
441
drizzled_drizzled_DEPENDENCIES= ${noinst_LTLIBRARIES} $(pandora_plugin_libs)
428
442
 
436
450
                drizzled/comp_creator.cc \
437
451
                drizzled/create_field.cc \
438
452
                drizzled/current_session.cc \
 
453
                drizzled/decimal.cc \
439
454
                drizzled/diagnostics_area.cc \
440
455
                drizzled/drizzled.cc \
441
456
                drizzled/dtcollation.cc \
613
628
                drizzled/key_map.cc \
614
629
                drizzled/lock.cc \
615
630
                drizzled/lookup_symbol.cc \
616
 
                drizzled/memory/multi_malloc.cc \
617
631
                drizzled/my_decimal.cc \
 
632
                drizzled/my_hash.cc \
 
633
                drizzled/my_time.cc \
 
634
                drizzled/my_tree.cc \
618
635
                drizzled/name_resolution_context_state.cc \
619
636
                drizzled/natural_join_column.cc \
620
637
                drizzled/optimizer/explain_plan.cc \
653
670
                drizzled/show.cc \
654
671
                drizzled/sql_alloc.cc \
655
672
                drizzled/sql_base.cc \
 
673
                drizzled/sql_bitmap.cc \
656
674
                drizzled/sql_delete.cc \
657
675
                drizzled/sql_derived.cc \
658
676
                drizzled/sql_error.cc \
718
736
                drizzled/temporal.cc \
719
737
                drizzled/temporal_format.cc \
720
738
                drizzled/temporal_interval.cc \
 
739
                drizzled/thr_lock.cc \
721
740
                drizzled/time_functions.cc \
722
741
                drizzled/tztime.cc \
723
742
                drizzled/uniques.cc \
725
744
                drizzled/version.cc \
726
745
                drizzled/xid.cc
727
746
 
 
747
noinst_LTLIBRARIES += \
 
748
                drizzled/libcached_directory.la \
 
749
                drizzled/libcharset.la \
 
750
                drizzled/libdynamic_array.la \
 
751
                drizzled/liberror.la \
 
752
                drizzled/libgetopt.la \
 
753
                drizzled/libhandler.la \
 
754
                drizzled/libmemory.la \
 
755
                drizzled/libserialutil.la \
 
756
                drizzled/libtypelib.la
 
757
 
 
758
drizzled_libcharset_la_SOURCES = drizzled/charset.cc drizzled/charset-def.cc
 
759
drizzled_libdynamic_array_la_SOURCES = drizzled/dynamic_array.cc
 
760
drizzled_liberror_la_SOURCES = drizzled/my_error.cc
 
761
drizzled_libgetopt_la_SOURCES = drizzled/my_getopt.cc
 
762
drizzled_libtypelib_la_SOURCES = drizzled/typelib.cc
728
763
drizzled_libserialutil_la_SOURCES = drizzled/db.cc drizzled/table_proto_write.cc
729
764
drizzled_libserialutil_la_CXXFLAGS= ${AM_CXXFLAGS} ${PROTOSKIP_WARNINGS}
730
765
 
731
766
drizzled_libhandler_la_SOURCES = drizzled/cursor.cc drizzled/plugin/storage_engine.cc
732
767
 
 
768
drizzled_libcached_directory_la_SOURCES=drizzled/cached_directory.cc
 
769
drizzled_libmemory_la_SOURCES= \
 
770
                drizzled/memory/multi_malloc.cc \
 
771
                drizzled/memory/root.cc
 
772
 
733
773
AM_YFLAGS = -p DRIZZLE -d --verbose
734
774
 
735
775