← Back to branch summary

~launchpad/subunit/launchpad-ppa-hardy

« back to all changes in this revision

Viewing changes to Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Robert Collins
  • Date: 2009-12-20 16:33:29 UTC
  • mfrom: (1.1.3 upstream) (3.2.3 sid)
  • Revision ID: james.westby@ubuntu.com-20091220163329-o60chash60h5zzj2
Tags: 0.0.4-4
Upstream bugfix for FTBFS on test_child.c.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.am
1
1
EXTRA_DIST =  \
 
2
        .bzrignore \
 
3
        Apache-2.0 \
 
4
        BSD \
2
5
        INSTALL \
3
6
        Makefile.am \
 
7
        NEWS \
4
8
        README \
5
 
        NEWS \
 
9
        c++/README \
6
10
        c/README \
7
11
        c/check-subunit-0.9.3.patch \
8
12
        c/check-subunit-0.9.5.patch \
9
13
        c/check-subunit-0.9.6.patch \
10
 
        c++/README \
11
 
        c++/cppunit-subunit-1.10.2.patch \
12
 
        perl/subunit-diff \
13
14
        perl/Makefile.PL.in \
 
15
        perl/lib/Subunit.pm \
14
16
        perl/lib/Subunit/Diff.pm \
15
 
        perl/lib/Subunit.pm \
16
 
        python/subunit/__init__.py \
17
 
        python/subunit/progress_model.py \
18
 
        python/subunit/run.py \
 
17
        perl/subunit-diff \
 
18
        python/iso8601/LICENSE \
 
19
        python/iso8601/README \
 
20
        python/iso8601/README.subunit \
 
21
        python/iso8601/setup.py \
 
22
        python/iso8601/test_iso8601.py \
19
23
        python/subunit/tests/TestUtil.py \
20
24
        python/subunit/tests/__init__.py \
21
25
        python/subunit/tests/sample-script.py \
22
26
        python/subunit/tests/sample-two-script.py \
 
27
        python/subunit/tests/test_chunked.py \
 
28
        python/subunit/tests/test_details.py \
 
29
        python/subunit/tests/test_progress_model.py \
23
30
        python/subunit/tests/test_subunit_filter.py \
24
31
        python/subunit/tests/test_subunit_stats.py \
25
32
        python/subunit/tests/test_subunit_tags.py \
26
33
        python/subunit/tests/test_tap2subunit.py \
27
 
        python/subunit/tests/test_progress_model.py \
28
34
        python/subunit/tests/test_test_protocol.py \
29
35
        python/subunit/tests/test_test_results.py \
30
36
        runtests.py \
36
42
 
37
43
ACLOCAL_AMFLAGS = -I m4
38
44
 
39
 
SUBUNIT_CFLAGS = -Wall -Werror -Wextra -Wstrict-prototypes -Wmissing-prototypes \
40
 
        -Wwrite-strings -Wno-variadic-macros -I$(top_srcdir)/c/include
41
 
AM_CFLAGS = $(SUBUNIT_CFLAGS)
42
 
 
43
45
include_subunitdir = $(includedir)/subunit
44
46
 
45
47
dist_bin_SCRIPTS = \
52
54
        filters/subunit2pyunit \
53
55
        filters/tap2subunit
54
56
 
55
 
TESTS_ENVIRONMENT = SHELL_SHARE='$(top_srcdir)/shell/share/' PYTHONPATH='$(abs_top_srcdir)/python':${PYTHONPATH} 
 
57
TESTS_ENVIRONMENT = SHELL_SHARE='$(top_srcdir)/shell/share/' PYTHONPATH='$(abs_top_srcdir)/python':${PYTHONPATH}
56
58
TESTS = runtests.py $(check_PROGRAMS)
57
59
 
58
60
## install libsubunit.pc
59
61
pcdatadir = $(libdir)/pkgconfig
60
 
pcdata_DATA = libsubunit.pc
 
62
pcdata_DATA = \
 
63
        libsubunit.pc \
 
64
        libcppunit_subunit.pc
61
65
 
62
66
pkgpython_PYTHON = \
63
67
        python/subunit/__init__.py \
 
68
        python/subunit/chunked.py \
 
69
        python/subunit/details.py \
64
70
        python/subunit/iso8601.py \
65
71
        python/subunit/progress_model.py \
66
72
        python/subunit/run.py \
67
73
        python/subunit/test_results.py
68
74
 
69
75
lib_LTLIBRARIES = libsubunit.la
 
76
lib_LTLIBRARIES +=  libcppunit_subunit.la
70
77
 
71
78
include_subunit_HEADERS = \
72
 
        c/include/subunit/child.h
 
79
        c/include/subunit/child.h \
 
80
        c++/SubunitTestProgressListener.h
73
81
 
74
82
check_PROGRAMS = \
75
83
        c/tests/test_child
81
89
        c/lib/child.c \
82
90
        c/include/subunit/child.h
83
91
 
 
92
libcppunit_subunit_la_SOURCES = \
 
93
        c++/SubunitTestProgressListener.cpp \
 
94
        c++/SubunitTestProgressListener.h
 
95
 
84
96
tests_LDADD = @CHECK_LIBS@ $(top_builddir)/libsubunit.la
85
 
c_tests_test_child_CFLAGS = $(SUBUNIT_CFLAGS) @CHECK_CFLAGS@
 
97
c_tests_test_child_CFLAGS = -Ic/include $(SUBUNIT_CFLAGS) @CHECK_CFLAGS@
86
98
c_tests_test_child_LDADD = $(tests_LDADD)
87
99
 
88
100
 
93
105
        $(MAKE) -C perl check
94
106
 
95
107
clean-local:
96
 
        find . -name "*.pyc" | xargs -r rm
 
108
        find . -type f -name "*.pyc" -exec rm {} ';'
97
109
        rm -f perl/Makefile
98
110
 
99
111
# Remove perl dir for VPATH builds.