← Back to branch summary

~ubuntu-branches/ubuntu/maverick/evolution-data-server/maverick-proposed

« back to all changes in this revision

Viewing changes to camel/tests/mime-filter/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2010-05-17 17:02:06 UTC
  • mfrom: (1.1.79 upstream) (1.6.12 experimental)
  • Revision ID: james.westby@ubuntu.com-20100517170206-4ufr52vwrhh26yh0
Tags: 2.30.1-1ubuntu1
https://launchpad.net/bugs/42199
https://launchpad.net/bugs/229669
https://launchpad.net/bugs/173703
https://launchpad.net/bugs/360344
https://launchpad.net/bugs/508494
* Merge from debian experimental. Remaining change:
  (LP: #42199, #229669, #173703, #360344, #508494)
  + debian/control:
    - add Vcs-Bzr tag
    - don't use libgnome
    - Use Breaks instead of Conflicts against evolution 2.25 and earlier.
  + debian/evolution-data-server.install,
    debian/patches/45_libcamel_providers_version.patch:
    - use the upstream versioning, not a Debian-specific one 
  + debian/libedata-book1.2-dev.install, debian/libebackend-1.2-dev.install,
    debian/libcamel1.2-dev.install, debian/libedataserverui1.2-dev.install:
    - install html documentation
  + debian/rules:
    - don't build documentation it's shipped with the tarball

Show diffs side-by-side

added added

removed removed

Lines of Context:
camel/tests/mime-filter/Makefile.am
1
 
 
2
 
AM_CPPFLAGS =                                           \
 
1
MIMEFILTER_TESTS_CPPFLAGS= \
 
2
        $(AM_CPPFLAGS)                                  \
3
3
        -I$(includedir)                                 \
4
4
        -I$(top_srcdir)                                 \
5
5
        -I$(top_srcdir)/camel                           \
8
8
        -DSOURCEDIR=\"$(srcdir)\"                               \
9
9
        $(CAMEL_CFLAGS)
10
10
 
11
 
LDADD = \
 
11
MIMEFILTER_TESTS_LDADD= \
12
12
        $(top_builddir)/camel/libcamel-${API_VERSION}.la                \
13
13
        $(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la \
14
14
        $(top_builddir)/camel/tests/lib/libcameltest.a  \
28
28
        test-charset            \
29
29
        test-tohtml
30
30
 
31
 
#TESTS = test1 \
32
 
#       test-crlf test-charset test-tohtml
 
31
test1_CPPFLAGS = $(MIMEFILTER_TESTS_CPPFLAGS)
 
32
test1_LDADD = $(MIMEFILTER_TESTS_LDADD)
 
33
test_crlf_CPPFLAGS = $(MIMEFILTER_TESTS_CPPFLAGS)
 
34
test_crlf_LDFLAGS = $(MIMEFILTER_TESTS_LDADD)
 
35
test_charset_CPPFLAGS = $(MIMEFILTER_TESTS_CPPFLAGS)
 
36
test_charset_LDFLAGS = $(MIMEFILTER_TESTS_LDADD)
 
37
test_tohtml_CPPFLAGS = $(MIMEFILTER_TESTS_CPPFLAGS)
 
38
test_tohtml_LDFLAGS = $(MIMEFILTER_TESTS_LDADD)
 
39
 
 
40
-include $(top_srcdir)/git.mk