← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/Makefile.am

  • Committer: mark
  • Date: 2008-07-01 02:58:18 UTC
  • Revision ID: mark@domu-12-31-38-00-78-33-20080701025818-yddp963tryopka0t
fix merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/Makefile.am
33
33
pkglib_LIBRARIES =      libmyisam.a
34
34
bin_PROGRAMS =          myisamchk myisamlog myisampack myisam_ftdump
35
35
myisamchk_DEPENDENCIES= $(LIBRARIES)
36
 
<<<<<<< TREE
37
 
myisamchk_LDADD=         libmyisam.a \
38
 
=======
39
 
myisamchk_LDADD=                libmyisam.a \
40
 
>>>>>>> MERGE-SOURCE
 
36
myisamchk_LDADD=        libmyisam.a \
41
37
                        $(top_builddir)/mysys/libmysys.a \
42
38
                        $(top_builddir)/dbug/libdbug.a \
43
39
                        $(top_builddir)/strings/libmystrings.a -lz
44
40
myisamlog_DEPENDENCIES= $(LIBRARIES)
45
 
<<<<<<< TREE
46
 
myisamlog_LDADD=         libmyisam.a \
47
 
=======
48
 
myisamlog_LDADD=                libmyisam.a \
49
 
>>>>>>> MERGE-SOURCE
 
41
myisamlog_LDADD=        libmyisam.a \
50
42
                        $(top_builddir)/mysys/libmysys.a \
51
43
                        $(top_builddir)/dbug/libdbug.a \
52
44
                        $(top_builddir)/strings/libmystrings.a -lz
53
45
myisampack_DEPENDENCIES=$(LIBRARIES)
54
 
<<<<<<< TREE
55
 
myisampack_LDADD=        libmyisam.a \
56
 
=======
57
 
myisampack_LDADD=               libmyisam.a \
58
 
>>>>>>> MERGE-SOURCE
 
46
myisampack_LDADD=       libmyisam.a \
59
47
                        $(top_builddir)/mysys/libmysys.a \
60
48
                        $(top_builddir)/dbug/libdbug.a \
61
49
                        $(top_builddir)/strings/libmystrings.a -lz
64
52
                        fulltext.h ftdefs.h ft_test1.h ft_eval.h \
65
53
                        ha_myisam.h mi_extrafunc.h
66
54
mi_test1_DEPENDENCIES=  $(LIBRARIES)
67
 
<<<<<<< TREE
68
 
mi_test1_LDADD=  libmyisam.a \
69
 
=======
70
55
mi_test1_LDADD=         libmyisam.a \
71
 
>>>>>>> MERGE-SOURCE
72
56
                        $(top_builddir)/mysys/libmysys.a \
73
57
                        $(top_builddir)/dbug/libdbug.a \
74
58
                        $(top_builddir)/strings/libmystrings.a -lz
75
59
mi_test2_DEPENDENCIES=  $(LIBRARIES)
76
 
<<<<<<< TREE
77
 
mi_test2_LDADD=  libmyisam.a \
78
 
=======
79
60
mi_test2_LDADD=         libmyisam.a \
80
 
>>>>>>> MERGE-SOURCE
81
61
                        $(top_builddir)/mysys/libmysys.a \
82
62
                        $(top_builddir)/dbug/libdbug.a \
83
63
                        $(top_builddir)/strings/libmystrings.a -lz
84
64
mi_test3_DEPENDENCIES=  $(LIBRARIES)
85
 
<<<<<<< TREE
86
 
mi_test3_LDADD=  libmyisam.a \
87
 
=======
88
65
mi_test3_LDADD=         libmyisam.a \
89
 
>>>>>>> MERGE-SOURCE
90
66
                        $(top_builddir)/mysys/libmysys.a \
91
67
                        $(top_builddir)/dbug/libdbug.a \
92
68
                        $(top_builddir)/strings/libmystrings.a -lz
93
69
#ft_test1_DEPENDENCIES= $(LIBRARIES)
94
70
#ft_eval_DEPENDENCIES=  $(LIBRARIES)
95
71
myisam_ftdump_DEPENDENCIES=     $(LIBRARIES)
96
 
<<<<<<< TREE
97
 
myisam_ftdump_LDADD =            libmyisam.a \
98
 
=======
99
 
myisam_ftdump_LDADD =                   libmyisam.a \
100
 
>>>>>>> MERGE-SOURCE
 
72
myisam_ftdump_LDADD =   libmyisam.a \
101
73
                        $(top_builddir)/mysys/libmysys.a \
102
74
                        $(top_builddir)/dbug/libdbug.a \
103
75
                        $(top_builddir)/strings/libmystrings.a -lz
104
76
rt_test_DEPENDENCIES=   $(LIBRARIES)
105
 
<<<<<<< TREE
106
 
rt_test_LDADD =          libmyisam.a \
107
 
=======
108
 
rt_test_LDADD =                 libmyisam.a \
109
 
>>>>>>> MERGE-SOURCE
 
77
rt_test_LDADD =         libmyisam.a \
110
78
                        $(top_builddir)/mysys/libmysys.a \
111
79
                        $(top_builddir)/dbug/libdbug.a \
112
80
                        $(top_builddir)/strings/libmystrings.a -lz
113
81
sp_test_DEPENDENCIES=   $(LIBRARIES)
114
 
<<<<<<< TREE
115
 
sp_test_LDADD =          libmyisam.a \
116
 
=======
117
 
sp_test_LDADD =                 libmyisam.a \
118
 
>>>>>>> MERGE-SOURCE
 
82
sp_test_LDADD =         libmyisam.a \
119
83
                        $(top_builddir)/mysys/libmysys.a \
120
84
                        $(top_builddir)/dbug/libdbug.a \
121
85
                        $(top_builddir)/strings/libmystrings.a -lz