← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/Makefile.am

Merged build changes from Antony.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/Makefile.am
25
25
 
26
26
pkgplugindir =$(pkglibdir)/plugin
27
27
 
28
 
AM_CPPFLAGS =-I$(top_builddir)/include \
29
 
             -I$(top_srcdir)/include \
30
 
             -I$(srcdir) $(openssl_includes) \
31
 
             $(libevent_includes) \
32
 
             -ggdb
33
 
 
34
 
SUBDIRS =. share
 
28
SUBDIRS = field . share
35
29
 
36
30
libexec_PROGRAMS =drizzled
37
31
 
39
33
 
40
34
bin_PROGRAMS =
41
35
 
42
 
bin_SCRIPTS = drizzledumpslow \
43
 
drizzled_safe 
 
36
bin_SCRIPTS =   drizzledumpslow \
 
37
                drizzled_safe 
 
38
 
 
39
AM_CPPFLAGS = ${GLOBAL_CPPFLAGS} ${LIBEVENT_CPPFLAGS}
44
40
 
45
41
DTRACE = @DTRACE@
46
42
 
53
49
              sql_select.o \
54
50
              sql_update.o
55
51
 
 
52
pkginclude_HEADERS =    error.h \
 
53
                        plugin.h \
 
54
                        plugin_audit.h
 
55
 
56
56
noinst_LTLIBRARIES = libhandler.la
57
57
 
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
 
58
LDADD = $(top_builddir)/vio/libviolt.la \
 
59
        $(top_builddir)/libdrizzle/libsqlcommon.la \
 
60
        $(top_builddir)/mysys/libmysyslt.la \
 
61
        $(top_builddir)/mystrings/libmystringslt.la \
 
62
        $(ZLIB_LIBS)
64
63
 
65
64
drizzled_LDADD = libhandler.la \
66
65
                 $(top_builddir)/libdrizzle/libdrizzle.la \
 
66
                 $(top_builddir)/drizzled/field/libfield.la \
67
67
                 $(libevent_libs) \
68
68
                 @mysql_plugin_libs@ \
69
69
                 $(LDADD) \
70
70
                 $(CXXLDFLAGS) \
71
 
                 @LIBDL@
 
71
                 $(LIBDL_LIBS) $(LIBEVENT_LIBS)
72
72
 
73
73
noinst_HEADERS = item.h \
74
74
                 item_func.h \
85
85
                 sql_lex.h \
86
86
                 sql_list.h \
87
87
                 sql_map.h \
 
88
                 sql_state.h \
88
89
                 sql_string.h \
89
90
                 unireg.h \
90
91
                 sql_error.h \
123
124
                 sql_array.h \
124
125
                 scheduler.h \
125
126
                 sql_plugin.h \
 
127
                 global.h \
 
128
                 base.h \
126
129
                 probes.h
127
130
 
128
131
drizzled_SOURCES = sql_lex.cc \
226
229
                  sql_yacc.h
227
230
 
228
231
BUILT_SOURCES = $(BUILT_MAINT_SRC) \
229
 
                lex_hash.h 
 
232
                lex_hash.h \
 
233
                version.h
230
234
 
231
235
EXTRA_DIST = $(BUILT_MAINT_SRC) \
232
236
             message.mc \
243
247
 
244
248
AM_YFLAGS = -d --verbose
245
249
 
 
250
 
 
251
# These files should not be included in distributions since they are
 
252
# generated by configure from the .h.in files
 
253
dist-hook:
 
254
        $(RM) -f $(distdir)/drizzle_version.h 
 
255
 
246
256
# This generates lex_hash.h
247
257
# NOTE Built sources should depend on their sources not the tool
248
258
# this avoid the rebuild of the built files in a source dist
249
259
lex_hash.h: gen_lex_hash$(EXEEXT) \
250
260
        $(srcdir)/lex.h
251
 
        $(top_builddir)/server/gen_lex_hash$(EXEEXT) > $@
 
261
        $(top_builddir)/drizzled/gen_lex_hash$(EXEEXT) > $@
252
262
 
253
263
probes.h: probes.d
254
264
        $(DTRACE) $(DTRACEFLAGS) -h -s probes.d