← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/Makefile.am

Merged from trunk. 
Moved resolve_stack_dump to mysql-test. 
Removed perl-sub cruft in mysql-test.

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
 
LDADD=                  $(top_builddir)/libdrizzle/libdrizzle.la \
19
 
                        $(LIBINTL) -lz
20
 
 
21
 
 
22
 
noinst_HEADERS =        completion_hash.h \
23
 
                        my_readline.h \
24
 
                        client_priv.h \
25
 
                        errname.h
26
 
 
27
 
CLEANFILES =            $(BUILT_SOURCES)
28
 
 
29
 
bin_PROGRAMS =  drizzle \
30
 
                                drizzleadmin \
31
 
                                drizzlebinlog \
32
 
                                drizzlecheck \
33
 
                                drizzledump \
34
 
                                drizzleimport \
35
 
                                drizzletest \
36
 
                                drizzleslap
37
 
 
38
 
drizzle_SOURCES =               drizzle.cc readline.cc completion_hash.cc
39
 
drizzle_LDADD =                 $(READLINE_LIBS) $(TERMCAP_LIBS) \
 
18
AM_CPPFLAGS =                   -I$(top_builddir)/include \
 
19
                                -I$(top_srcdir)/include \
 
20
                                -I$(top_srcdir)/regex \
 
21
                                -I$(top_srcdir)/sql \
 
22
                                -I$(top_srcdir)/strings
 
23
 
 
24
LIBS =                          @CLIENT_LIBS@ -lz
 
25
 
 
26
LDADD=                          $(top_builddir)/sql-common/libsqlcommon.la \
 
27
                                $(top_builddir)/libmysql/libmysqlclient.la -lz
 
28
 
 
29
 
 
30
noinst_HEADERS =                sql_string.h completion_hash.h my_readline.h \
 
31
                                client_priv.h
 
32
 
 
33
EXTRA_DIST =                    get_password.c 
 
34
 
 
35
CLEANFILES =                    $(BUILT_SOURCES)
 
36
 
 
37
if BUILD_MYSQLTEST
 
38
  d_mysqltest = mysqltest
 
39
endif
 
40
 
 
41
bin_PROGRAMS =                  mysql \
 
42
                                mysqladmin \
 
43
                                mysqlbinlog \
 
44
                                mysqlcheck \
 
45
                                mysqldump \
 
46
                                mysqlimport \
 
47
                                mysqlshow \
 
48
                                ${d_mysqltest} \
 
49
                                mysqlslap 
 
50
 
 
51
mysql_SOURCES =                 mysql.cc readline.cc sql_string.cc \
 
52
                                completion_hash.cc
 
53
mysql_LDADD =                   -lreadline @TERMCAP_LIB@ \
40
54
                                $(LDADD) $(CXXLDFLAGS)
41
 
drizzle_CXXFLAGS =              ${AM_CXXFLAGS} -fexceptions
42
 
drizzleadmin_SOURCES =          drizzleadmin.cc
43
 
 
44
 
drizzlebinlog_SOURCES =     drizzlebinlog.cc \
45
 
                $(top_srcdir)/mysys/mf_tempdir.c \
46
 
                $(top_srcdir)/mysys/my_bit.c \
47
 
                $(top_srcdir)/mysys/my_bitmap.c \
48
 
                $(top_srcdir)/mysys/base64.c
49
 
 
50
 
drizzlecheck_SOURCES =          drizzlecheck.cc
51
 
drizzledump_SOURCES=            drizzledump.cc 
52
 
 
53
 
drizzleimport_SOURCES=          drizzleimport.cc
54
 
 
55
 
drizzleslap_SOURCES=            drizzleslap.cc
56
 
 
57
 
drizzletest_SOURCES=            drizzletest.cc 
58
 
drizzletest_LDADD =             ${LDADD} $(PCRE_LIBS)
59
 
drizzletest_CXXFLAGS =          ${AM_CXXFLAGS} $(PCRE_CFLAGS)
60
 
 
61
 
DEFS =  -DDEFAULT_DRIZZLE_HOME="\"$(prefix)\"" \
62
 
        -DDATADIR="\"$(localstatedir)\"" \
63
 
        -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
55
mysqladmin_SOURCES =            mysqladmin.cc
 
56
 
 
57
mysqlbinlog_SOURCES =           mysqlbinlog.cc \
 
58
                                $(top_srcdir)/mysys/mf_tempdir.c \
 
59
                                $(top_srcdir)/mysys/my_new.cc \
 
60
                                $(top_srcdir)/mysys/my_bit.c \
 
61
                                $(top_srcdir)/mysys/my_bitmap.c \
 
62
                                $(top_srcdir)/mysys/base64.c 
 
63
mysqlbinlog_LDADD =             $(LDADD) $(CXXLDFLAGS) 
 
64
 
 
65
mysqldump_SOURCES=              mysqldump.c \
 
66
                                $(top_srcdir)/mysys/mf_getdate.c
 
67
 
 
68
mysqlimport_SOURCES=            mysqlimport.c
 
69
 
 
70
mysqlshow_SOURCES=              mysqlshow.c
 
71
 
 
72
mysqlslap_SOURCES=              mysqlslap.c
 
73
mysqlslap_CFLAGS=               -DTHREAD -UUNDEF_THREADS_HACK
 
74
 
 
75
if BUILD_MYSQLTEST
 
76
mysqltest_SOURCES=              mysqltest.cc \
 
77
                                $(top_srcdir)/mysys/my_getsystime.c \
 
78
                                $(top_srcdir)/mysys/my_copy.c \
 
79
                                $(top_srcdir)/mysys/my_mkdir.c
 
80
mysqltest_LDADD =               ${LDADD} @PCRE_LIBS@
 
81
mysqltest_CFLAGS =              ${AM_CPPFLAGS} @PCRE_CFLAGS@
 
82
endif
 
83
 
 
84
# Fix for mit-threads
 
85
DEFS =                  -DUNDEF_THREADS_HACK \
 
86
                        -DDEFAULT_MYSQL_HOME="\"$(prefix)\"" \
 
87
                        -DDATADIR="\"$(localstatedir)\""