← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/Makefile.am

Merged changes from codestyle.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/Makefile.am
13
13
# along with this program; if not, write to the Free Software
14
14
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
15
15
 
 
16
if BUILD_DBUG
 
17
  d_dbug = $(top_builddir)/dbug/libdbuglt.la
 
18
endif
 
19
 
 
20
 
16
21
#called from the top level Makefile
17
22
 
18
23
MYSQLDATAdir =          $(localstatedir)
26
31
SUBDIRS =               share
27
32
libexec_PROGRAMS =      mysqld
28
33
EXTRA_PROGRAMS =        gen_lex_hash
29
 
bin_PROGRAMS =          mysql_tzinfo_to_sql
 
34
bin_PROGRAMS =          
 
35
bin_SCRIPTS =           mysqldumpslow mysqld_safe 
 
36
 
30
37
DTRACE =                @DTRACE@
31
38
DTRACEFLAGS =           @DTRACEFLAGS@
32
39
DTRACEFILES =           handler.o \
36
43
                        sql_select.o \
37
44
                        sql_update.o
38
45
 
39
 
noinst_LTLIBRARIES = 
 
46
noinst_LTLIBRARIES =    libhandler.la
40
47
 
41
48
SUPPORTING_LIBS =       $(top_builddir)/vio/libviolt.la \
42
49
                        $(top_builddir)/mysys/libmysyslt.la \
43
 
                        $(top_builddir)/dbug/libdbuglt.la \
 
50
                        $(d_dbug) \
44
51
                        $(top_builddir)/strings/libmystringslt.la 
45
 
mysqld_DEPENDENCIES=    @mysql_plugin_libs@ $(SUPPORTING_LIBS)
46
52
LDADD = $(SUPPORTING_LIBS) -lz -levent
47
53
mysqld_LDADD =          $(top_builddir)/sql-common/libsqlcommon.la \
 
54
                        libhandler.la \
48
55
                        $(libevent_libs) \
49
56
                        @mysql_plugin_libs@ \
50
57
                        $(LDADD)  $(CXXLDFLAGS) @LIBDL@
78
85
                        item_row.cc \
79
86
                        field.cc strfunc.cc key.cc sql_class.cc sql_list.cc \
80
87
                        protocol.cc sql_state.c \
81
 
                        lock.cc my_lock.c \
 
88
                        lock.cc \
82
89
                        sql_string.cc sql_manager.cc sql_map.cc \
83
90
                        mysqld.cc hash_filo.cc \
84
91
                        sql_connect.cc scheduler.cc sql_parse.cc \
91
98
                        unireg.cc \
92
99
                        log_event.cc rpl_record.cc \
93
100
                        discover.cc time.cc opt_range.cc opt_sum.cc \
94
 
                        records.cc filesort.cc handler.cc \
 
101
                        records.cc filesort.cc \
95
102
                        sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \
96
103
                        sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc \
97
104
                        sql_udf.cc \
106
113
                        sql_plugin.cc sql_binlog.cc \
107
114
                        sql_builtin.cc 
108
115
 
 
116
libhandler_la_SOURCES = handler.cc
109
117
nodist_mysqld_SOURCES = client.c net_serv.c
110
118
 
111
119
if HAVE_DTRACE
115
123
gen_lex_hash_SOURCES =  gen_lex_hash.cc
116
124
gen_lex_hash_LDFLAGS =  
117
125
 
118
 
mysql_tzinfo_to_sql_SOURCES = tztime.cc
119
 
mysql_tzinfo_to_sql_CXXFLAGS= -DTZINFO2SQL
120
 
 
121
126
DEFS =                  -DMYSQL_SERVER \
122
127
                        -DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
123
128
                        -DDATADIR="\"$(MYSQLDATAdir)\"" \