~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/Makefile.am

  • Committer: Brian Aker
  • Date: 2008-07-08 21:36:11 UTC
  • mfrom: (77.1.34 codestyle)
  • Revision ID: brian@tangent.org-20080708213611-b0k2zy8eldttqct3
Merging up Monty's changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
41
41
                                mysqldump \
42
42
                                mysqlimport \
43
43
                                mysqlshow \
44
 
                                mysqlslap \
45
 
                                mysqltest 
 
44
                                mysqltest \
 
45
                                mysqlslap 
46
46
 
47
47
mysql_SOURCES =                 mysql.cc readline.cc sql_string.cc \
48
48
                                completion_hash.cc
68
68
mysqlslap_SOURCES=              mysqlslap.c
69
69
mysqlslap_CFLAGS=               -DTHREAD -UUNDEF_THREADS_HACK
70
70
 
71
 
mysqltest_SOURCES=              mysqltest.c \
 
71
mysqltest_SOURCES=              mysqltest.cc \
72
72
                                $(top_srcdir)/mysys/my_getsystime.c \
73
73
                                $(top_srcdir)/mysys/my_copy.c \
74
74
                                $(top_srcdir)/mysys/my_mkdir.c
75
 
mysqltest_LDADD =               $(top_builddir)/regex/libregex.a $(LDADD)
 
75
mysqltest_LDADD =               ${LDADD} @PCRE_LIBS@
 
76
mysqltest_CFLAGS =              ${AM_CPPFLAGS} @PCRE_CFLAGS@
76
77
 
77
78
# Fix for mit-threads
78
79
DEFS =                  -DUNDEF_THREADS_HACK \