← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/Makefile.am

  • Committer: Brian Aker
  • Date: 2008-07-01 20:52:03 UTC
  • mfrom: (28.1.23 libtool-patch)
  • Revision ID: brian@tangent.org-20080701205203-3jm6ga57uzxy8k4t
Merge of taylor's work

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/Makefile.am
20
20
MYSQLBASEdir=           $(prefix)
21
21
MYSQLLIBdir=            $(pkglibdir)
22
22
pkgplugindir =          $(pkglibdir)/plugin
23
 
INCLUDES =              -I$(top_builddir)/include -I$(top_srcdir)/include \
 
23
AM_CPPFLAGS =           -I$(top_builddir)/include -I$(top_srcdir)/include \
24
24
                        -I$(srcdir) $(openssl_includes) \
25
25
                        $(libevent_includes)
26
26
SUBDIRS =               share
36
36
                        sql_select.o \
37
37
                        sql_update.o
38
38
 
39
 
noinst_LTLIBRARIES=
 
39
noinst_LTLIBRARIES = 
40
40
 
41
 
SUPPORTING_LIBS =       $(top_builddir)/vio/libvio.a \
42
 
                        $(top_builddir)/mysys/libmysys.a \
43
 
                        $(top_builddir)/dbug/libdbug.a \
44
 
                        $(top_builddir)/strings/libmystrings.a
 
41
SUPPORTING_LIBS =       $(top_builddir)/vio/libviolt.la \
 
42
                        $(top_builddir)/mysys/libmysyslt.la \
 
43
                        $(top_builddir)/dbug/libdbuglt.la \
 
44
                        $(top_builddir)/strings/libmystringslt.la 
45
45
mysqld_DEPENDENCIES=    @mysql_plugin_libs@ $(SUPPORTING_LIBS)
46
46
LDADD = $(SUPPORTING_LIBS) -lz -levent
47
 
mysqld_LDADD =          $(libevent_libs) \
 
47
mysqld_LDADD =          $(top_builddir)/sql-common/libsqlcommon.la \
 
48
                        $(libevent_libs) \
48
49
                        @mysql_plugin_libs@ \
49
50
                        $(LDADD)  $(CXXLDFLAGS) @LIBDL@
50
51
 
64
65
                        sql_repl.h slave.h rpl_filter.h \
65
66
                        log_event.h rpl_record.h \
66
67
                        stacktrace.h sql_sort.h set_var.h \
67
 
                        client_settings.h tzfile.h \
 
68
                        tzfile.h \
68
69
                        tztime.h my_decimal.h\
69
70
                        sql_array.h scheduler.h \
70
71
                        sql_plugin.h \
76
77
                        thr_malloc.cc item_create.cc item_subselect.cc \
77
78
                        item_row.cc \
78
79
                        field.cc strfunc.cc key.cc sql_class.cc sql_list.cc \
79
 
                        net_serv.cc protocol.cc sql_state.c \
 
80
                        protocol.cc sql_state.c \
80
81
                        lock.cc my_lock.c \
81
82
                        sql_string.cc sql_manager.cc sql_map.cc \
82
 
                        mysqld.cc password.c hash_filo.cc \
 
83
                        mysqld.cc hash_filo.cc \
83
84
                        sql_connect.cc scheduler.cc sql_parse.cc \
84
85
                        set_var.cc sql_yacc.yy \
85
86
                        sql_base.cc table.cc sql_select.cc sql_insert.cc \
103
104
                        sql_olap.cc \
104
105
                        tztime.cc my_decimal.cc\
105
106
                        sql_plugin.cc sql_binlog.cc \
106
 
                        sql_builtin.cc
 
107
                        sql_builtin.cc 
 
108
 
 
109
nodist_mysqld_SOURCES = client.c net_serv.c
107
110
 
108
111
if HAVE_DTRACE
109
112
  mysqld_SOURCES += probes.d
110
113
endif
111
114
 
112
 
nodist_mysqld_SOURCES = mini_client_errors.c pack.c client.c my_time.c
113
 
 
114
115
gen_lex_hash_SOURCES =  gen_lex_hash.cc
115
116
gen_lex_hash_LDFLAGS =  
116
117
 
129
130
EXTRA_DIST =            $(BUILT_MAINT_SRC) \
130
131
                        message.mc \
131
132
                        probes.d
132
 
CLEANFILES =            lex_hash.h sql_yacc.output link_sources
 
133
CLEANFILES =            lex_hash.h sql_yacc.output link_sources $(nodist_mysqld_SOURCES)
133
134
DISTCLEANFILES =        $(EXTRA_PROGRAMS)
134
135
MAINTAINERCLEANFILES =  $(BUILT_MAINT_SRC)
135
136
AM_YFLAGS =             -d --verbose
136
137
 
137
138
# These are listed in 'nodist_mysqld_SOURCES'
138
139
link_sources:
139
 
        rm -f mini_client_errors.c
140
 
        @LN_CP_F@ $(top_srcdir)/libmysql/errmsg.c mini_client_errors.c
141
 
        rm -f pack.c
142
 
        @LN_CP_F@ $(top_srcdir)/sql-common/pack.c pack.c
143
140
        rm -f client.c
144
 
        @LN_CP_F@ $(top_srcdir)/sql-common/client.c client.c
145
 
        rm -f my_time.c
146
 
        @LN_CP_F@ $(top_srcdir)/sql-common/my_time.c my_time.c
 
141
        @LN_CP_F@ $(top_srcdir)/libmysql/client.c client.c
 
142
        rm -f net_serv.c
 
143
        @LN_CP_F@ $(top_srcdir)/libmysql/net_serv.c net_serv.c
147
144
        echo timestamp > link_sources
148
145
 
 
146
 
149
147
# This generates lex_hash.h
150
148
# NOTE Built sources should depend on their sources not the tool
151
149
# this avoid the rebuild of the built files in a source dist
152
 
lex_hash.h:     gen_lex_hash.cc lex.h
153
 
                $(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
154
 
                ./gen_lex_hash$(EXEEXT) > $@-t
155
 
                $(MV) $@-t $@
 
150
lex_hash.h: $(builddir)/gen_lex_hash$(EXEEXT) $(srcdir)/lex.h
 
151
                $(builddir)/gen_lex_hash$(EXEEXT) > $@
156
152
 
157
153
probes.h: probes.d
158
154
        $(DTRACE) $(DTRACEFLAGS) -h -s probes.d
164
160
 
165
161
.d.o : $(DTRACEFILES)
166
162
        $(DTRACE) $(DTRACEFLAGS) -G -s $< $(DTRACEFILES)
167
 
 
168
 
# Don't update the files from bitkeeper
169
 
%::SCCS/s.%