← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/Makefile.am

Replaced regex lib with pcre. Reworked mysqltest to use it. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/Makefile.am
34
34
 
35
35
CLEANFILES =                    $(BUILT_SOURCES)
36
36
 
 
37
if BUILD_MYSQLTEST
 
38
  d_mysqltest = mysqltest
 
39
endif
 
40
 
37
41
bin_PROGRAMS =                  mysql \
38
42
                                mysqladmin \
39
43
                                mysqlbinlog \
41
45
                                mysqldump \
42
46
                                mysqlimport \
43
47
                                mysqlshow \
44
 
                                mysqlslap \
45
 
                                mysqltest 
 
48
                                ${d_mysqltest} \
 
49
                                mysqlslap 
46
50
 
47
51
mysql_SOURCES =                 mysql.cc readline.cc sql_string.cc \
48
52
                                completion_hash.cc
68
72
mysqlslap_SOURCES=              mysqlslap.c
69
73
mysqlslap_CFLAGS=               -DTHREAD -UUNDEF_THREADS_HACK
70
74
 
71
 
mysqltest_SOURCES=              mysqltest.c \
 
75
if BUILD_MYSQLTEST
 
76
mysqltest_SOURCES=              mysqltest.cc \
72
77
                                $(top_srcdir)/mysys/my_getsystime.c \
73
78
                                $(top_srcdir)/mysys/my_copy.c \
74
79
                                $(top_srcdir)/mysys/my_mkdir.c
75
 
mysqltest_LDADD =               $(top_builddir)/regex/libregex.a $(LDADD)
 
80
mysqltest_LDADD =               ${LDADD} @PCRE_LIBS@
 
81
mysqltest_CFLAGS =              ${AM_CPPFLAGS} @PCRE_CFLAGS@
 
82
endif
76
83
 
77
84
# Fix for mit-threads
78
85
DEFS =                  -DUNDEF_THREADS_HACK \