← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/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:
storage/myisam/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
 
16
20
MYSQLDATAdir =          $(localstatedir)
17
21
MYSQLSHAREdir =         $(pkgdatadir)
18
22
MYSQLBASEdir =          $(prefix)
36
40
myisamchk_DEPENDENCIES= $(LIBRARIES)
37
41
myisamchk_LDADD=        libmyisam.a \
38
42
                        $(top_builddir)/mysys/libmysyslt.la \
39
 
                        $(top_builddir)/dbug/libdbuglt.la \
 
43
                        $(d_dbug) \
40
44
                        $(top_builddir)/strings/libmystringslt.la -lz
41
45
myisamlog_DEPENDENCIES= $(LIBRARIES)
42
46
myisamlog_LDADD=        libmyisam.a \
43
47
                        $(top_builddir)/mysys/libmysyslt.la \
44
 
                        $(top_builddir)/dbug/libdbuglt.la \
 
48
                        $(d_dbug) \
45
49
                        $(top_builddir)/strings/libmystringslt.la -lz
46
50
myisampack_DEPENDENCIES=$(LIBRARIES)
47
51
myisampack_LDADD=       libmyisam.a \
48
52
                        $(top_builddir)/mysys/libmysyslt.la \
49
 
                        $(top_builddir)/dbug/libdbuglt.la \
 
53
                        $(d_dbug) \
50
54
                        $(top_builddir)/strings/libmystringslt.la -lz
51
55
noinst_PROGRAMS =       mi_test1 mi_test2 mi_test3 rt_test sp_test #ft_test1 ft_eval
52
56
noinst_HEADERS =        myisamdef.h rt_index.h rt_key.h rt_mbr.h sp_defs.h \
55
59
mi_test1_DEPENDENCIES=  $(LIBRARIES)
56
60
mi_test1_LDADD=         libmyisam.a \
57
61
                        $(top_builddir)/mysys/libmysyslt.la \
58
 
                        $(top_builddir)/dbug/libdbuglt.la \
 
62
                        $(d_dbug) \
59
63
                        $(top_builddir)/strings/libmystringslt.la -lz
60
64
mi_test2_DEPENDENCIES=  $(LIBRARIES)
61
65
mi_test2_LDADD=         libmyisam.a \
62
66
                        $(top_builddir)/mysys/libmysyslt.la \
63
 
                        $(top_builddir)/dbug/libdbuglt.la \
 
67
                        $(d_dbug) \
64
68
                        $(top_builddir)/strings/libmystringslt.la -lz
65
69
mi_test3_DEPENDENCIES=  $(LIBRARIES)
66
70
mi_test3_LDADD=         libmyisam.a \
67
71
                        $(top_builddir)/mysys/libmysyslt.la \
68
 
                        $(top_builddir)/dbug/libdbuglt.la \
 
72
                        $(d_dbug) \
69
73
                        $(top_builddir)/strings/libmystringslt.la -lz
70
74
#ft_test1_DEPENDENCIES= $(LIBRARIES)
71
75
#ft_eval_DEPENDENCIES=  $(LIBRARIES)
72
76
myisam_ftdump_DEPENDENCIES=     $(LIBRARIES)
73
77
myisam_ftdump_LDADD =   libmyisam.a \
74
78
                        $(top_builddir)/mysys/libmysyslt.la \
75
 
                        $(top_builddir)/dbug/libdbuglt.la \
 
79
                        $(d_dbug) \
76
80
                        $(top_builddir)/strings/libmystringslt.la -lz
77
81
rt_test_DEPENDENCIES=   $(LIBRARIES)
78
82
rt_test_LDADD =         libmyisam.a \
79
83
                        $(top_builddir)/mysys/libmysyslt.la \
80
 
                        $(top_builddir)/dbug/libdbuglt.la \
 
84
                        $(d_dbug) \
81
85
                        $(top_builddir)/strings/libmystringslt.la -lz
82
86
sp_test_DEPENDENCIES=   $(LIBRARIES)
83
87
sp_test_LDADD =         libmyisam.a \
84
88
                        $(top_builddir)/mysys/libmysyslt.la \
85
 
                        $(top_builddir)/dbug/libdbuglt.la \
 
89
                        $(d_dbug) \
86
90
                        $(top_builddir)/strings/libmystringslt.la -lz
87
91
libmyisam_a_SOURCES =   mi_open.c mi_extra.c mi_info.c mi_rkey.c \
88
92
                        mi_rnext.c mi_rnext_same.c \