← 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
24
24
             drizzled/filesort.o \
25
25
             drizzled/join.o \
26
26
             drizzled/session.o \
 
27
             drizzled/signal_handler.o \
27
28
             drizzled/sql_delete.o \
28
29
             drizzled/sql_insert.o \
29
30
             drizzled/sql_parse.o \
869
870
MAINTAINERCLEANFILES+= $(BUILT_MAINT_SRC)
870
871
 
871
872
drizzled/generated_probes.h : drizzled/probes.d
872
 
        $(DTRACE) $(DTRACEFLAGS) -h -s drizzled/probes.d -o drizzled/generated_probes.h
 
873
        $(DTRACE) $(DTRACEFLAGS) -h -s ${top_srcdir}/drizzled/probes.d -o drizzled/generated_probes.h
873
874
        mv drizzled/generated_probes.h drizzled/generated_probes.h.bak
874
875
        sed "s/#include <unistd.h>//g" drizzled/generated_probes.h.bak > drizzled/generated_probes.h
875
876
        rm drizzled/generated_probes.h.bak