← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/Makefile.am

  • Committer: Brian Aker
  • Date: 2009-01-10 22:27:38 UTC
  • mfrom: (779.1.8 devel)
  • Revision ID: brian@tangent.org-20090110222738-zx4zzq9lsa3othvn
Merge for Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/Makefile.am
18
18
LDADD=                  $(top_builddir)/libdrizzle/libdrizzle.la \
19
19
                        $(top_builddir)/mysys/libmysys.la \
20
20
                        $(top_builddir)/mystrings/libmystrings.la \
21
 
                        $(LIBINTL) -lz
 
21
                        $(LIBINTL) $(LTLIBZ)
22
22
 
23
23
 
24
24
noinst_HEADERS =        completion_hash.h \
37
37
                                drizzleslap
38
38
 
39
39
drizzle_SOURCES =               drizzle.cc readline.cc completion_hash.cc
40
 
drizzle_LDADD =                 $(READLINE_LIBS) $(TERMCAP_LIBS)  \
41
 
                                $(LDADD) $(CXXLDFLAGS)
42
 
drizzle_CXXFLAGS =              ${AM_CXXFLAGS} ${READLINE_CFLAGS} \
43
 
                                ${W_EXCEPTIONS} 
 
40
drizzle_LDADD =                 ${LDADD} ${READLINE_LIBS}
 
41
drizzle_CXXFLAGS =              ${AM_CXXFLAGS} ${W_EXCEPTIONS} 
44
42
drizzleadmin_SOURCES =          drizzleadmin.cc
45
43
 
46
44
drizzlecheck_SOURCES =          drizzlecheck.cc
51
49
drizzleslap_SOURCES=            drizzleslap.cc
52
50
 
53
51
drizzletest_SOURCES=            drizzletest.cc 
54
 
drizzletest_LDADD =             ${LDADD} $(PCRE_LIBS)
55
 
drizzletest_CXXFLAGS =          ${AM_CXXFLAGS} ${PCRE_CFLAGS}
 
52
drizzletest_LDADD=              ${LDADD} ${PCRE_LIBS}
 
53
drizzletest_CXXFLAGS=           ${AM_CXXFLAGS} ${PCRE_CFLAGS}
56
54