← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libmysql/Makefile.am

  • Committer: Monty Taylor
  • Date: 2008-07-05 18:48:15 UTC
  • mto: This revision was merged to the branch mainline in revision 63.
  • Revision ID: monty@inaugust.com-20080705184815-tpoj3z762hoh8t6p
Added an automake conditional to not build the dbug dir, since I don't want to keep seeing errors for it while cleaning up other parts of the tree. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
libmysql/Makefile.am
20
20
#
21
21
# This file is public domain and comes with NO WARRANTY of any kind
22
22
 
 
23
if BUILD_DBUG
 
24
  d_dbug = $(top_builddir)/dbug/libdbuglt.la
 
25
endif
 
26
 
23
27
MYSQLDATAdir =                  $(localstatedir)
24
28
MYSQLSHAREdir =                 $(pkgdatadir)
25
29
MYSQLBASEdir=                   $(prefix)
30
34
libmysqlclient_la_LIBADD = ${sql_cmn_objects} ${sqlobjects} \
31
35
                           ${top_builddir}/mysys/libmysyslt.la \
32
36
                           ${top_builddir}/strings/libmystringslt.la \
33
 
                           ${top_builddir}/dbug/libdbuglt.la \
 
37
                           $(d_dbug) \
34
38
                           ${top_builddir}/sql-common/libsqlcommon.la \
35
39
                           ${top_builddir}/vio/libviolt.la 
36
40
libmysqlclient_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@ @LD_VERSION_SCRIPT@