← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/Makefile.am

  • Committer: Brian Aker
  • Date: 2008-07-22 17:32:05 UTC
  • mfrom: (202.1.3 toru)
  • Revision ID: brian@tangent.org-20080722173205-fbst5dw713h0gx3o
Merge of Toru + Brian

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 \
89
86
                 unireg.h \
90
87
                 sql_error.h \
91
88
                 field.h \
 
89
                 field/blob.h \
 
90
                 field/null.h \
 
91
                 field/datetime.h \
 
92
                 field/timetype.h \
 
93
                 field/timestamp.h \
 
94
     field/date.h \
 
95
     field/year.h \
 
96
                 field/short.h \
 
97
                 field/long.h \
 
98
                 field/int64_t.h \
 
99
                 field/decimal.h \
 
100
                 field/double.h \
 
101
                 field/string.h \
 
102
                 field/varstring.h \
 
103
                 field/set.h \
92
104
                 handler.h \
93
105
                 mysqld_suffix.h \
94
106
                 rpl_constants.h \
139
151
                   item_subselect.cc \
140
152
                   item_row.cc \
141
153
                   field.cc \
 
154
                         field/blob.cc \
 
155
                         field/null.cc \
 
156
                         field/datetime.cc \
 
157
                         field/timetype.cc \
 
158
                         field/timestamp.cc \
 
159
       field/date.cc \
 
160
       field/year.cc \
 
161
                         field/short.cc \
 
162
                         field/long.cc \
 
163
                         field/int64_t.cc \
 
164
                         field/decimal.cc \
 
165
                         field/double.cc \
 
166
                         field/string.cc \
 
167
                         field/varstring.cc \
 
168
                         field/set.cc \
142
169
                   strfunc.cc \
143
170
                   key.cc \
144
171
                   sql_class.cc \