← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/Makefile.am

Merge from trunk 

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/Makefile.am
46
46
noinst_LTLIBRARIES =    libhandler.la
47
47
 
48
48
SUPPORTING_LIBS =       $(top_builddir)/vio/libviolt.la \
 
49
                        $(top_builddir)/libdrizzle/libsqlcommon.la \
49
50
                        $(top_builddir)/mysys/libmysyslt.la \
50
51
                        $(d_dbug) \
51
52
                        $(top_builddir)/strings/libmystringslt.la 
52
53
LDADD = $(SUPPORTING_LIBS) -lz -levent
53
 
drizzled_LDADD =        $(top_builddir)/sql-common/libsqlcommon.la \
54
 
                        libhandler.la \
 
54
drizzled_LDADD =        libhandler.la \
55
55
                        $(libevent_libs) \
56
56
                        @mysql_plugin_libs@ \
57
57
                        $(LDADD)  $(CXXLDFLAGS) @LIBDL@
143
143
# These are listed in 'nodist_drizzled_SOURCES'
144
144
link_sources:
145
145
        rm -f client.c
146
 
        @LN_CP_F@ $(top_srcdir)/libmysql/client.c client.c
 
146
        @LN_CP_F@ $(top_srcdir)/libdrizzle/client.c client.c
147
147
        rm -f net_serv.c
148
 
        @LN_CP_F@ $(top_srcdir)/libmysql/net_serv.c net_serv.c
 
148
        @LN_CP_F@ $(top_srcdir)/libdrizzle/net_serv.c net_serv.c
149
149
        echo timestamp > link_sources
150
150
 
151
151
 
153
153
# NOTE Built sources should depend on their sources not the tool
154
154
# this avoid the rebuild of the built files in a source dist
155
155
lex_hash.h: gen_lex_hash$(EXEEXT) $(srcdir)/lex.h
156
 
                $(top_builddir)/sql/gen_lex_hash$(EXEEXT) > $@
 
156
                $(top_builddir)/server/gen_lex_hash$(EXEEXT) > $@
157
157
 
158
158
probes.h: probes.d
159
159
        $(DTRACE) $(DTRACEFLAGS) -h -s probes.d