← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/Makefile.am

Merged build changes from Antony.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/Makefile.am
15
15
 
16
16
# This file is public domain and comes with NO WARRANTY of any kind
17
17
 
18
 
AM_CPPFLAGS =           -I$(top_builddir)/include \
19
 
                                        -I$(top_srcdir)/include 
20
 
 
21
18
LDADD=                          $(top_builddir)/libdrizzle/libdrizzle.la -lz
22
19
 
23
20
 
24
 
noinst_HEADERS =        completion_hash.h my_readline.h client_priv.h
 
21
noinst_HEADERS =        completion_hash.h \
 
22
                        my_readline.h \
 
23
                        client_priv.h \
 
24
                        errname.h
25
25
 
26
26
CLEANFILES =            $(BUILT_SOURCES)
27
27
 
35
35
                                mysqlslap 
36
36
 
37
37
drizzle_SOURCES =               drizzle.c readline.c completion_hash.c
38
 
drizzle_LDADD =                 -lreadline @TERMCAP_LIB@ $(GLIB_LIBS) \
 
38
drizzle_LDADD =                 $(READLINE_LIBS) $(TERMCAP_LIBS) $(GLIB_LIBS) \
39
39
                                $(LDADD) $(CXXLDFLAGS)
40
 
drizzle_CPPFLAGS =              $(AM_CPPFLAGS) $(GLIB_CFLAGS)
41
40
drizzleadmin_SOURCES =          drizzleadmin.cc
42
41
 
43
42
drizzlebinlog_SOURCES =     drizzlebinlog.cc \
46
45
                $(top_srcdir)/mysys/my_bit.c \
47
46
                $(top_srcdir)/mysys/my_bitmap.c \
48
47
                $(top_srcdir)/mysys/base64.c
49
 
drizzlebinlog_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/server
50
48
 
51
49
drizzledump_SOURCES=            drizzledump.c 
52
50
 
56
54
mysqlslap_CFLAGS=               -DTHREAD -UUNDEF_THREADS_HACK
57
55
 
58
56
drizzletest_SOURCES=            drizzletest.cc 
59
 
drizzletest_LDADD =             ${LDADD} @PCRE_LIBS@
60
 
drizzletest_CFLAGS =            ${AM_CPPFLAGS} @PCRE_CFLAGS@
 
57
drizzletest_LDADD =             ${LDADD} $(PCRE_LIBS)
 
58
drizzletest_CFLAGS =            ${AM_CPPFLAGS} $(PCRE_CFLAGS)
61
59
 
62
60
# Fix for mit-threads
63
61
DEFS =                  -DUNDEF_THREADS_HACK \