← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

Viewing changes to plugin/archive/plugin.am

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2010-10-02 14:17:48 UTC
  • mfrom: (1.1.1 upstream)
  • mto: (2.1.17 sid)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20101002141748-m6vbfbfjhrw1153e
Tags: 2010.09.1802-1
* New upstream release.
* Removed pid-file argument hack.
* Updated GPL-2 address to be new address.
* Directly copy in drizzledump.1 since debian doesn't have sphinx 1.0 yet.
* Link to jquery from libjs-jquery. Add it as a depend.
* Add drizzled.8 symlink to the install files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/archive/plugin.am
17
17
test_archive_LDADD = \
18
18
                        $(top_builddir)/plugin/archive/libazio.la \
19
19
                        $(LDADD) \
 
20
                        $(BOOST_LIBS) \
20
21
                        $(LIBINTL) \
21
22
                        $(LTLIBZ)
22
23
 
 
24
if BUILD_ARCHIVE_PLUGIN
23
25
noinst_LTLIBRARIES+=  plugin/archive/libazio.la
 
26
endif
24
27
noinst_HEADERS+= \
25
28
                 plugin/archive/azio.h
26
29
plugin_archive_libazio_la_SOURCES= \
43
46
plugin_archive_archive_test_LDADD= $(test_archive_LDADD)
44
47
 
45
48
plugin_archive_archive_reader_SOURCES= plugin/archive/archive_reader.cc
46
 
plugin_archive_archive_reader_LDADD= $(test_archive_LDADD)
 
49
plugin_archive_archive_reader_LDADD= $(test_archive_LDADD) ${BOOST_LIBS}
 
50
plugin_archive_archive_reader_CXXFLAGS= ${AM_CXXFLAGS} ${BOOSTSKIP_WARNINGS}
47
51
 
48
52
plugin_archive_concurrency_test_SOURCES= plugin/archive/concurrency_test.cc
49
53
plugin_archive_concurrency_test_LDADD= $(test_archive_LDADD)