← 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: 2009-02-27 21:38:40 UTC
  • Revision ID: brian@tangent.org-20090227213840-r9hq3sfk8d8qrg72
Code cleanup in signal_handler.cc

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/archive/Makefile.am
13
13
# along with this program; if not, write to the Free Software
14
14
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
15
15
 
16
 
#called from the top level Makefile
17
 
 
18
 
 
19
 
MYSQLDATAdir =          $(localstatedir)
20
 
MYSQLSHAREdir =         $(pkgdatadir)
21
 
MYSQLBASEdir=           $(prefix)
22
 
MYSQLLIBdir=            $(pkglibdir)
23
 
pkgplugindir =          $(pkglibdir)/plugin
24
 
 
25
 
LDADD = $(LIBINTL)
26
 
 
27
 
DEFS =                  @DEFS@ -DHAVE_DRIZZLE_CONFIG_H
 
16
LDADD = $(LIBINTL) $(LTLIBZ)
28
17
 
29
18
noinst_HEADERS =        ha_archive.h azio.h
30
19
noinst_PROGRAMS =       archive_test archive_reader archive_performance concurrency_test
31
20
 
32
21
EXTRA_LTLIBRARIES =     ha_archive.la
33
22
pkglib_LTLIBRARIES =    @plugin_archive_shared_target@
34
 
ha_archive_la_LDFLAGS = -module -rpath $(pkgplugindir) $(LDADD)
 
23
ha_archive_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) $(LDADD)
35
24
ha_archive_la_CXXFLAGS= $(AM_CXXFLAGS) -DDRIZZLE_DYNAMIC_PLUGIN
36
25
ha_archive_la_CFLAGS =  $(AM_CFLAGS) -DDRIZZLE_DYNAMIC_PLUGIN 
37
 
ha_archive_la_SOURCES = ha_archive.cc azio.c
 
26
ha_archive_la_SOURCES = ha_archive.cc azio.cc
38
27
 
39
28
 
40
29
EXTRA_LIBRARIES =       libarchive.a
41
30
noinst_LIBRARIES =      @plugin_archive_static_target@
42
31
libarchive_a_CXXFLAGS = $(AM_CXXFLAGS) 
43
32
libarchive_a_CFLAGS =   $(AM_CFLAGS) 
44
 
libarchive_a_SOURCES =  ha_archive.cc azio.c
 
33
libarchive_a_SOURCES =  ha_archive.cc azio.cc
45
34
 
46
 
archive_performance_SOURCES =   archive_performance.c azio.c
 
35
archive_performance_SOURCES =   archive_performance.c azio.cc
47
36
archive_performance_CFLAGS =    $(AM_CFLAGS) 
48
37
archive_performance_LDADD =     $(top_builddir)/mysys/libmysys.la \
49
38
                        $(top_builddir)/mystrings/libmystrings.la \
50
 
                        $(LDADD) \
51
 
                        -lz
 
39
                        $(LDADD)
52
40
archive_performance_LDFLAGS =
53
41
 
54
 
archive_test_SOURCES =  archive_test.c azio.c
 
42
archive_test_SOURCES =  archive_test.c azio.cc
55
43
archive_test_CFLAGS =   $(AM_CFLAGS) 
56
44
archive_test_LDADD =    $(top_builddir)/mysys/libmysys.la \
57
45
                        $(top_builddir)/mystrings/libmystrings.la \
58
 
                        $(LDADD) \
59
 
                        -lz
 
46
                        $(LDADD)
60
47
archive_test_LDFLAGS =
61
48
 
62
 
archive_reader_SOURCES = archive_reader.c azio.c
 
49
archive_reader_SOURCES = archive_reader.c azio.cc
63
50
archive_reader_CFLAGS = $(AM_CFLAGS) 
64
51
archive_reader_LDADD =  $(top_builddir)/mysys/libmysys.la \
65
52
                        $(top_builddir)/mystrings/libmystrings.la \
66
 
                        $(LDADD) \
67
 
                        -lz
 
53
                        $(LDADD)
68
54
archive_reader_LDFLAGS =
69
55
 
70
 
concurrency_test_SOURCES = concurrency_test.c azio.c
 
56
concurrency_test_SOURCES = concurrency_test.c azio.cc
71
57
concurrency_test_CFLAGS =       $(AM_CFLAGS) 
72
58
concurrency_test_LDADD =        $(top_builddir)/mysys/libmysys.la \
73
59
                        $(top_builddir)/mystrings/libmystrings.la \
74
 
                        $(top_builddir)/libdrizzle/libdrizzle.la \
75
 
                        $(LDADD) \
76
 
                        -lz
 
60
                        $(top_builddir)/libdrizzleclient/libdrizzleclient.la \
 
61
                        $(LDADD)
77
62
concurrency_test_LDFLAGS =
78
63
 
79
64
valgrind-test: archive_test archive_performance