← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/archive/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/archive/Makefile.am
15
15
 
16
16
#called from the top level Makefile
17
17
 
18
 
LIBMYSQLCLIENT_LA =             $(top_builddir)/libmysql/libmysqlclient.la
19
 
 
20
18
MYSQLDATAdir =          $(localstatedir)
21
19
MYSQLSHAREdir =         $(pkgdatadir)
22
20
MYSQLBASEdir=           $(prefix)
23
21
MYSQLLIBdir=            $(pkglibdir)
24
22
pkgplugindir =          $(pkglibdir)/plugin
25
 
INCLUDES =              -I$(top_srcdir)/include -I$(top_builddir)/include \
 
23
AM_CPPFLAGS =              -I$(top_srcdir)/include -I$(top_builddir)/include \
26
24
                        -I$(top_srcdir)/regex \
27
25
                        -I$(top_srcdir)/sql \
28
26
                        -I$(srcdir)
52
50
 
53
51
archive_performance_SOURCES =   archive_performance.c azio.c
54
52
archive_performance_CFLAGS =    $(AM_CFLAGS) 
55
 
archive_performance_LDADD =     $(top_builddir)/mysys/libmysys.a \
56
 
                        $(top_builddir)/dbug/libdbug.a \
57
 
                        $(top_builddir)/strings/libmystrings.a \
 
53
archive_performance_LDADD =     $(top_builddir)/mysys/libmysyslt.la \
 
54
                        $(top_builddir)/dbug/libdbuglt.la \
 
55
                        $(top_builddir)/strings/libmystringslt.la \
58
56
                        $(LDADD) \
59
57
                        -lz
60
58
archive_performance_LDFLAGS =
61
59
 
62
60
archive_test_SOURCES =  archive_test.c azio.c
63
61
archive_test_CFLAGS =   $(AM_CFLAGS) 
64
 
archive_test_LDADD =    $(top_builddir)/mysys/libmysys.a \
65
 
                        $(top_builddir)/dbug/libdbug.a \
66
 
                        $(top_builddir)/strings/libmystrings.a \
 
62
archive_test_LDADD =    $(top_builddir)/mysys/libmysyslt.la \
 
63
                        $(top_builddir)/dbug/libdbuglt.la \
 
64
                        $(top_builddir)/strings/libmystringslt.la \
67
65
                        $(LDADD) \
68
66
                        -lz
69
67
archive_test_LDFLAGS =
70
68
 
71
69
archive_reader_SOURCES = archive_reader.c azio.c
72
70
archive_reader_CFLAGS = $(AM_CFLAGS) 
73
 
archive_reader_LDADD =  $(top_builddir)/mysys/libmysys.a \
74
 
                        $(top_builddir)/dbug/libdbug.a \
75
 
                        $(top_builddir)/strings/libmystrings.a \
 
71
archive_reader_LDADD =  $(top_builddir)/mysys/libmysyslt.la \
 
72
                        $(top_builddir)/dbug/libdbuglt.la \
 
73
                        $(top_builddir)/strings/libmystringslt.la \
76
74
                        $(LDADD) \
77
75
                        -lz
78
76
archive_reader_LDFLAGS =
79
77
 
80
78
concurrency_test_SOURCES = concurrency_test.c azio.c
81
79
concurrency_test_CFLAGS =       $(AM_CFLAGS) 
82
 
concurrency_test_LDADD =        $(top_builddir)/mysys/libmysys.a \
83
 
                        $(top_builddir)/dbug/libdbug.a \
84
 
                        $(top_builddir)/strings/libmystrings.a \
85
 
                        $(LIBMYSQLCLIENT_LA) \
 
80
concurrency_test_LDADD =        $(top_builddir)/mysys/libmysyslt.la \
 
81
                        $(top_builddir)/dbug/libdbuglt.la \
 
82
                        $(top_builddir)/strings/libmystringslt.la \
 
83
                        $(top_builddir)/libmysql/libmysqlclient.la \
86
84
                        $(LDADD) \
87
85
                        -lz
88
86
concurrency_test_LDFLAGS =
93
91
        libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  ./archive_performance
94
92
 
95
93
EXTRA_DIST =            CMakeLists.txt plug.in
96
 
# Don't update the files from bitkeeper
97
 
%::SCCS/s.%