← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/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:
sql/Makefile.am
13
13
# along with this program; if not, write to the Free Software
14
14
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
15
15
 
 
16
if BUILD_DBUG
 
17
  d_dbug = $(top_builddir)/dbug/libdbuglt.la
 
18
endif
 
19
 
 
20
 
16
21
#called from the top level Makefile
17
22
 
18
23
MYSQLDATAdir =          $(localstatedir)
40
45
 
41
46
SUPPORTING_LIBS =       $(top_builddir)/vio/libviolt.la \
42
47
                        $(top_builddir)/mysys/libmysyslt.la \
43
 
                        $(top_builddir)/dbug/libdbuglt.la \
 
48
                        $(d_dbug) \
44
49
                        $(top_builddir)/strings/libmystringslt.la 
45
50
mysqld_DEPENDENCIES=    @mysql_plugin_libs@ $(SUPPORTING_LIBS)
46
51
LDADD = $(SUPPORTING_LIBS) -lz -levent