← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/Makefile.am

Merged from trunk. 
Moved resolve_stack_dump to mysql-test. 
Removed perl-sub cruft in mysql-test.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/Makefile.am
29
29
                        -I$(srcdir) $(openssl_includes) \
30
30
                        $(libevent_includes)
31
31
SUBDIRS =               share
32
 
libexec_PROGRAMS =      mysqld
 
32
libexec_PROGRAMS =      drizzled
33
33
EXTRA_PROGRAMS =        gen_lex_hash
34
34
bin_PROGRAMS =          
35
35
bin_SCRIPTS =           mysqldumpslow mysqld_safe 
50
50
                        $(d_dbug) \
51
51
                        $(top_builddir)/strings/libmystringslt.la 
52
52
LDADD = $(SUPPORTING_LIBS) -lz -levent
53
 
mysqld_LDADD =          $(top_builddir)/sql-common/libsqlcommon.la \
 
53
drizzled_LDADD =                $(top_builddir)/sql-common/libsqlcommon.la \
54
54
                        libhandler.la \
55
55
                        $(libevent_libs) \
56
56
                        @mysql_plugin_libs@ \
78
78
                        sql_plugin.h \
79
79
                        probes.h
80
80
 
81
 
mysqld_SOURCES =        sql_lex.cc sql_handler.cc \
 
81
drizzled_SOURCES =      sql_lex.cc sql_handler.cc \
82
82
                        item.cc item_sum.cc item_buff.cc item_func.cc \
83
83
                        item_cmpfunc.cc item_strfunc.cc item_timefunc.cc \
84
84
                        thr_malloc.cc item_create.cc item_subselect.cc \
114
114
                        sql_builtin.cc 
115
115
 
116
116
libhandler_la_SOURCES = handler.cc
117
 
nodist_mysqld_SOURCES = client.c net_serv.c
 
117
nodist_drizzled_SOURCES = client.c net_serv.c
118
118
 
119
119
if HAVE_DTRACE
120
 
  mysqld_SOURCES += probes.d
 
120
  drizzled_SOURCES += probes.d
121
121
endif
122
122
 
123
123
gen_lex_hash_SOURCES =  gen_lex_hash.cc