← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/include.am

Merged with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/include.am
16
16
 
17
17
sbin_PROGRAMS= drizzled/drizzled
18
18
 
19
 
DTRACEFILES = drizzled/cursor.o \
 
19
DTRACEFILES = drizzled/.libs/cursor.o \
 
20
              drizzled/sql_select.o \
20
21
              drizzled/filesort.o \
21
22
              drizzled/drizzled.o \
 
23
              drizzled/join.o \
22
24
              drizzled/session.o \
23
25
              drizzled/sql_delete.o \
24
26
              drizzled/sql_insert.o \
25
 
              drizzled/sql_select.o \
26
27
              drizzled/sql_update.o \
27
28
              drizzled/sql_parse.o \
28
29
              drizzled/statement/delete.o \
256
257
                drizzled/open_tables_state.h \
257
258
                drizzled/optimizer/key_field.h \
258
259
                drizzled/optimizer/key_use.h \
 
260
                drizzled/optimizer/explain_plan.h \
259
261
                drizzled/optimizer/position.h \
 
262
                drizzled/optimizer/quick_group_min_max_select.h \
260
263
                drizzled/optimizer/quick_index_merge_select.h \
261
264
                drizzled/optimizer/quick_range.h \
262
265
                drizzled/optimizer/quick_range_select.h \
 
266
                drizzled/optimizer/quick_ror_intersect_select.h \
 
267
                drizzled/optimizer/quick_ror_union_select.h \
263
268
                drizzled/optimizer/range.h \
264
269
                drizzled/optimizer/range_param.h \
265
270
                drizzled/optimizer/sargable_param.h \
266
271
                drizzled/optimizer/sel_arg.h \
267
272
                drizzled/optimizer/sum.h \
 
273
                drizzled/optimizer/table_read_plan.h \
268
274
                drizzled/order.h \
269
275
                drizzled/plugin.h \
270
276
                drizzled/plugin/authentication.h \
408
414
                 $(pandora_plugin_libs) \
409
415
                 $(LDADD) $(LIBUUID) ${top_builddir}/gnulib/libgnu.la \
410
416
                 $(LIBDL_LIBS) $(LIBPROTOBUF) $(LIBPCRE) $(LIBTBB) \
411
 
                 $(PANDORA_PLUGIN_DEP_LIBS) $(GCOV_LIBS)
 
417
                 $(PANDORA_PLUGIN_DEP_LIBS) $(GCOV_LIBS) 
412
418
 
413
419
drizzled_drizzled_DEPENDENCIES= ${noinst_LTLIBRARIES} $(pandora_plugin_libs)
414
420
 
610
616
                drizzled/my_decimal.cc \
611
617
                drizzled/name_resolution_context_state.cc \
612
618
                drizzled/natural_join_column.cc \
 
619
                drizzled/optimizer/explain_plan.cc \
613
620
                drizzled/optimizer/key_field.cc \
 
621
                drizzled/optimizer/quick_group_min_max_select.cc \
614
622
                drizzled/optimizer/quick_index_merge_select.cc \
615
623
                drizzled/optimizer/quick_range.cc \
616
624
                drizzled/optimizer/quick_range_select.cc \
 
625
                drizzled/optimizer/quick_ror_intersect_select.cc \
 
626
                drizzled/optimizer/quick_ror_union_select.cc \
617
627
                drizzled/optimizer/range.cc \
618
628
                drizzled/optimizer/sel_arg.cc \
619
629
                drizzled/optimizer/sum.cc \
770
780
 
771
781
MAINTAINERCLEANFILES += $(BUILT_MAINT_SRC)
772
782
 
773
 
generated_probes.h : probes.d
774
 
        $(DTRACE) $(DTRACEFLAGS) -h -s probes.d -o generated_probes.h
 
783
drizzled/generated_probes.h : drizzled/probes.d
 
784
        $(DTRACE) $(DTRACEFLAGS) -h -s drizzled/probes.d -o drizzled/generated_probes.h
775
785
        mv drizzled/generated_probes.h drizzled/generated_probes.h.bak
776
 
        sed "s/#include <unistd.h>//g" drizzled/generated_probes.h.bak > drzzled/generated_probes.h
 
786
        sed "s/#include <unistd.h>//g" drizzled/generated_probes.h.bak > drizzled/generated_probes.h
777
787
        rm drizzled/generated_probes.h.bak
778
788
        sed -e 's,void \*,const void \*,g' drizzled/generated_probes.h | \
779
789
                sed -e 's,char \*,const char \*,g' | tr '\t' ' ' > dtrace_probes.tmp
789
799
 
790
800
.d.o : $(DTRACEFILES)
791
801
        $(DTRACE) $(DTRACEFLAGS) -G -s $< $(DTRACEFILES)
 
802
        mv probes.o drizzled/probes.o
792
803
 
793
804
drizzled/function_hash.h: drizzled/function_hash.stamp-h
794
805
drizzled/symbol_hash.h: drizzled/symbol_hash.stamp-h