← 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 01:26:01 UTC
  • Revision ID: mark@domu-12-31-38-00-78-33-20080701012601-hx5v7hk1ehtt1wig
strip out some autoconf cruft that was preventing building

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