← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/Makefile.am

Merge/fix in FAQ.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/Makefile.am
27
27
 
28
28
AM_CPPFLAGS =-I$(top_builddir)/include \
29
29
             -I$(top_srcdir)/include \
30
 
             -I$(srcdir) $(openssl_includes) \
31
 
             $(libevent_includes) \
32
 
             -ggdb
 
30
             -I$(srcdir) $(openssl_includes) 
33
31
 
34
32
SUBDIRS =. share
35
33
 
55
53
 
56
54
noinst_LTLIBRARIES = libhandler.la
57
55
 
58
 
SUPPORTING_LIBS = $(top_builddir)/vio/libviolt.la \
59
 
                  $(top_builddir)/libdrizzle/libsqlcommon.la \
60
 
                  $(top_builddir)/mysys/libmysyslt.la \
61
 
                  $(top_builddir)/strings/libmystringslt.la 
62
 
 
63
 
LDADD = $(SUPPORTING_LIBS) -lz -levent
 
56
LDADD = $(top_builddir)/vio/libviolt.la \
 
57
        $(top_builddir)/libdrizzle/libsqlcommon.la \
 
58
        $(top_builddir)/mysys/libmysyslt.la \
 
59
        $(top_builddir)/strings/libmystringslt.la \
 
60
        $(ZLIB_LIBS)
64
61
 
65
62
drizzled_LDADD = libhandler.la \
66
63
                 $(top_builddir)/libdrizzle/libdrizzle.la \
68
65
                 @mysql_plugin_libs@ \
69
66
                 $(LDADD) \
70
67
                 $(CXXLDFLAGS) \
71
 
                 @LIBDL@
 
68
                 $(LIBDL_LIBS) $(LIBEVENT_LIBS)
72
69
 
73
70
noinst_HEADERS = item.h \
74
71
                 item_func.h \