← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/Makefile.am

  • Committer: Stewart Smith
  • Date: 2008-07-09 01:40:54 UTC
  • mfrom: (105 drizzle)
  • mto: This revision was merged to the branch mainline in revision 111.
  • Revision ID: stewart@flamingspork.com-20080709014054-xfgfzirbhqzrzkkj
merge from mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/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
bin_SCRIPTS =           drizzledumpslow drizzled_safe 
 
36
 
35
37
DTRACE =                @DTRACE@
36
38
DTRACEFLAGS =           @DTRACEFLAGS@
37
39
DTRACEFILES =           handler.o \
41
43
                        sql_select.o \
42
44
                        sql_update.o
43
45
 
44
 
noinst_LTLIBRARIES = 
 
46
noinst_LTLIBRARIES =    libhandler.la
45
47
 
46
48
SUPPORTING_LIBS =       $(top_builddir)/vio/libviolt.la \
47
49
                        $(top_builddir)/mysys/libmysyslt.la \
48
50
                        $(d_dbug) \
49
51
                        $(top_builddir)/strings/libmystringslt.la 
50
 
mysqld_DEPENDENCIES=    @mysql_plugin_libs@ $(SUPPORTING_LIBS)
51
52
LDADD = $(SUPPORTING_LIBS) -lz -levent
52
 
mysqld_LDADD =          $(top_builddir)/sql-common/libsqlcommon.la \
 
53
drizzled_LDADD =        $(top_builddir)/sql-common/libsqlcommon.la \
 
54
                        libhandler.la \
53
55
                        $(libevent_libs) \
54
56
                        @mysql_plugin_libs@ \
55
57
                        $(LDADD)  $(CXXLDFLAGS) @LIBDL@
65
67
                        opt_range.h protocol.h rpl_tblmap.h rpl_utility.h \
66
68
                        rpl_reporting.h \
67
69
                        log.h sql_show.h rpl_rli.h rpl_mi.h \
68
 
                        sql_select.h structs.h table.h sql_udf.h hash_filo.h \
 
70
                        sql_select.h structs.h table.h sql_udf.h \
69
71
                        lex.h lex_symbol.h sql_crypt.h  \
70
72
                        sql_repl.h slave.h rpl_filter.h \
71
73
                        log_event.h rpl_record.h \
76
78
                        sql_plugin.h \
77
79
                        probes.h
78
80
 
79
 
mysqld_SOURCES =        sql_lex.cc sql_handler.cc \
 
81
drizzled_SOURCES =      sql_lex.cc sql_handler.cc \
80
82
                        item.cc item_sum.cc item_buff.cc item_func.cc \
81
83
                        item_cmpfunc.cc item_strfunc.cc item_timefunc.cc \
82
84
                        thr_malloc.cc item_create.cc item_subselect.cc \
85
87
                        protocol.cc sql_state.c \
86
88
                        lock.cc \
87
89
                        sql_string.cc sql_manager.cc sql_map.cc \
88
 
                        mysqld.cc hash_filo.cc \
 
90
                        drizzled.cc \
89
91
                        sql_connect.cc scheduler.cc sql_parse.cc \
90
92
                        set_var.cc sql_yacc.yy \
91
93
                        sql_base.cc table.cc sql_select.cc sql_insert.cc \
96
98
                        unireg.cc \
97
99
                        log_event.cc rpl_record.cc \
98
100
                        discover.cc time.cc opt_range.cc opt_sum.cc \
99
 
                        records.cc filesort.cc handler.cc \
 
101
                        records.cc filesort.cc \
100
102
                        sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \
101
103
                        sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc \
102
104
                        sql_udf.cc \
111
113
                        sql_plugin.cc sql_binlog.cc \
112
114
                        sql_builtin.cc 
113
115
 
114
 
nodist_mysqld_SOURCES = client.c net_serv.c
 
116
libhandler_la_SOURCES = handler.cc
 
117
nodist_drizzled_SOURCES = client.c net_serv.c
115
118
 
116
119
if HAVE_DTRACE
117
 
  mysqld_SOURCES += probes.d
 
120
  drizzled_SOURCES += probes.d
118
121
endif
119
122
 
120
123
gen_lex_hash_SOURCES =  gen_lex_hash.cc
132
135
EXTRA_DIST =            $(BUILT_MAINT_SRC) \
133
136
                        message.mc \
134
137
                        probes.d
135
 
CLEANFILES =            lex_hash.h sql_yacc.output link_sources $(nodist_mysqld_SOURCES)
 
138
CLEANFILES =            lex_hash.h sql_yacc.output link_sources $(nodist_drizzled_SOURCES)
136
139
DISTCLEANFILES =        $(EXTRA_PROGRAMS)
137
140
MAINTAINERCLEANFILES =  $(BUILT_MAINT_SRC)
138
141
AM_YFLAGS =             -d --verbose
139
142
 
140
 
# These are listed in 'nodist_mysqld_SOURCES'
 
143
# These are listed in 'nodist_drizzled_SOURCES'
141
144
link_sources:
142
145
        rm -f client.c
143
146
        @LN_CP_F@ $(top_srcdir)/libmysql/client.c client.c