← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/Makefile.am

  • Committer: Brian Aker
  • Date: 2008-07-01 20:52:03 UTC
  • mfrom: (28.1.23 libtool-patch)
  • Revision ID: brian@tangent.org-20080701205203-3jm6ga57uzxy8k4t
Merge of taylor's work

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/Makefile.am
17
17
MYSQLSHAREdir =         $(pkgdatadir)
18
18
MYSQLBASEdir=           $(prefix)
19
19
MYSQLLIBdir=            $(pkglibdir)
20
 
INCLUDES =              -I$(top_srcdir)/include -I$(top_builddir)/include \
 
20
AM_CPPFLAGS =              -I$(top_srcdir)/include -I$(top_builddir)/include \
21
21
                        -I$(top_srcdir)/regex \
22
22
                        -I$(top_srcdir)/sql \
23
23
                        -I$(srcdir)
34
34
bin_PROGRAMS =          myisamchk myisamlog myisampack myisam_ftdump
35
35
myisamchk_DEPENDENCIES= $(LIBRARIES)
36
36
myisamchk_LDADD=        libmyisam.a \
37
 
                        $(top_builddir)/mysys/libmysys.a \
38
 
                        $(top_builddir)/dbug/libdbug.a \
39
 
                        $(top_builddir)/strings/libmystrings.a -lz
 
37
                        $(top_builddir)/mysys/libmysyslt.la \
 
38
                        $(top_builddir)/dbug/libdbuglt.la \
 
39
                        $(top_builddir)/strings/libmystringslt.la -lz
40
40
myisamlog_DEPENDENCIES= $(LIBRARIES)
41
41
myisamlog_LDADD=        libmyisam.a \
42
 
                        $(top_builddir)/mysys/libmysys.a \
43
 
                        $(top_builddir)/dbug/libdbug.a \
44
 
                        $(top_builddir)/strings/libmystrings.a -lz
 
42
                        $(top_builddir)/mysys/libmysyslt.la \
 
43
                        $(top_builddir)/dbug/libdbuglt.la \
 
44
                        $(top_builddir)/strings/libmystringslt.la -lz
45
45
myisampack_DEPENDENCIES=$(LIBRARIES)
46
46
myisampack_LDADD=       libmyisam.a \
47
 
                        $(top_builddir)/mysys/libmysys.a \
48
 
                        $(top_builddir)/dbug/libdbug.a \
49
 
                        $(top_builddir)/strings/libmystrings.a -lz
 
47
                        $(top_builddir)/mysys/libmysyslt.la \
 
48
                        $(top_builddir)/dbug/libdbuglt.la \
 
49
                        $(top_builddir)/strings/libmystringslt.la -lz
50
50
noinst_PROGRAMS =       mi_test1 mi_test2 mi_test3 rt_test sp_test #ft_test1 ft_eval
51
51
noinst_HEADERS =        myisamdef.h rt_index.h rt_key.h rt_mbr.h sp_defs.h \
52
52
                        fulltext.h ftdefs.h ft_test1.h ft_eval.h \
53
53
                        ha_myisam.h mi_extrafunc.h
54
54
mi_test1_DEPENDENCIES=  $(LIBRARIES)
55
55
mi_test1_LDADD=         libmyisam.a \
56
 
                        $(top_builddir)/mysys/libmysys.a \
57
 
                        $(top_builddir)/dbug/libdbug.a \
58
 
                        $(top_builddir)/strings/libmystrings.a -lz
 
56
                        $(top_builddir)/mysys/libmysyslt.la \
 
57
                        $(top_builddir)/dbug/libdbuglt.la \
 
58
                        $(top_builddir)/strings/libmystringslt.la -lz
59
59
mi_test2_DEPENDENCIES=  $(LIBRARIES)
60
60
mi_test2_LDADD=         libmyisam.a \
61
 
                        $(top_builddir)/mysys/libmysys.a \
62
 
                        $(top_builddir)/dbug/libdbug.a \
63
 
                        $(top_builddir)/strings/libmystrings.a -lz
 
61
                        $(top_builddir)/mysys/libmysyslt.la \
 
62
                        $(top_builddir)/dbug/libdbuglt.la \
 
63
                        $(top_builddir)/strings/libmystringslt.la -lz
64
64
mi_test3_DEPENDENCIES=  $(LIBRARIES)
65
65
mi_test3_LDADD=         libmyisam.a \
66
 
                        $(top_builddir)/mysys/libmysys.a \
67
 
                        $(top_builddir)/dbug/libdbug.a \
68
 
                        $(top_builddir)/strings/libmystrings.a -lz
 
66
                        $(top_builddir)/mysys/libmysyslt.la \
 
67
                        $(top_builddir)/dbug/libdbuglt.la \
 
68
                        $(top_builddir)/strings/libmystringslt.la -lz
69
69
#ft_test1_DEPENDENCIES= $(LIBRARIES)
70
70
#ft_eval_DEPENDENCIES=  $(LIBRARIES)
71
71
myisam_ftdump_DEPENDENCIES=     $(LIBRARIES)
72
72
myisam_ftdump_LDADD =   libmyisam.a \
73
 
                        $(top_builddir)/mysys/libmysys.a \
74
 
                        $(top_builddir)/dbug/libdbug.a \
75
 
                        $(top_builddir)/strings/libmystrings.a -lz
 
73
                        $(top_builddir)/mysys/libmysyslt.la \
 
74
                        $(top_builddir)/dbug/libdbuglt.la \
 
75
                        $(top_builddir)/strings/libmystringslt.la -lz
76
76
rt_test_DEPENDENCIES=   $(LIBRARIES)
77
77
rt_test_LDADD =         libmyisam.a \
78
 
                        $(top_builddir)/mysys/libmysys.a \
79
 
                        $(top_builddir)/dbug/libdbug.a \
80
 
                        $(top_builddir)/strings/libmystrings.a -lz
 
78
                        $(top_builddir)/mysys/libmysyslt.la \
 
79
                        $(top_builddir)/dbug/libdbuglt.la \
 
80
                        $(top_builddir)/strings/libmystringslt.la -lz
81
81
sp_test_DEPENDENCIES=   $(LIBRARIES)
82
82
sp_test_LDADD =         libmyisam.a \
83
 
                        $(top_builddir)/mysys/libmysys.a \
84
 
                        $(top_builddir)/dbug/libdbug.a \
85
 
                        $(top_builddir)/strings/libmystrings.a -lz
 
83
                        $(top_builddir)/mysys/libmysyslt.la \
 
84
                        $(top_builddir)/dbug/libdbuglt.la \
 
85
                        $(top_builddir)/strings/libmystringslt.la -lz
86
86
libmyisam_a_SOURCES =   mi_open.c mi_extra.c mi_info.c mi_rkey.c \
87
87
                        mi_rnext.c mi_rnext_same.c \
88
88
                        mi_search.c mi_page.c mi_key.c mi_locking.c \
150
150
        @CHMOD@ +x $@-t
151
151
        @MV@ $@-t $@
152
152
 
153
 
# Don't update the files from bitkeeper
154
 
%::SCCS/s.%