Docstrings and renaming.

[third_party/subunit] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f6a4eff174a0a5802849c697f1db2d8ea7d6f943..716fa0fe211bdf0e05d9cf571255a140f7c60ce8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,30 +1,36 @@
 EXTRA_DIST =  \
+       .bzrignore \
+       Apache-2.0 \
+       BSD \
        INSTALL \
        Makefile.am \
-       README \
        NEWS \
+       README \
+       c++/README \
        c/README \
        c/check-subunit-0.9.3.patch \
        c/check-subunit-0.9.5.patch \
        c/check-subunit-0.9.6.patch \
-       c++/README \
-       c++/cppunit-subunit-1.10.2.patch \
-       perl/subunit-diff \
        perl/Makefile.PL.in \
-       perl/lib/Subunit/Diff.pm \
        perl/lib/Subunit.pm \
-       python/subunit/__init__.py \
-       python/subunit/progress_model.py \
-       python/subunit/run.py \
+       perl/lib/Subunit/Diff.pm \
+       perl/subunit-diff \
+       python/iso8601/LICENSE \
+       python/iso8601/README \
+       python/iso8601/README.subunit \
+       python/iso8601/setup.py \
+       python/iso8601/test_iso8601.py \
        python/subunit/tests/TestUtil.py \
        python/subunit/tests/__init__.py \
        python/subunit/tests/sample-script.py \
        python/subunit/tests/sample-two-script.py \
+       python/subunit/tests/test_chunked.py \
+       python/subunit/tests/test_details.py \
+       python/subunit/tests/test_progress_model.py \
        python/subunit/tests/test_subunit_filter.py \
        python/subunit/tests/test_subunit_stats.py \
        python/subunit/tests/test_subunit_tags.py \
        python/subunit/tests/test_tap2subunit.py \
-       python/subunit/tests/test_progress_model.py \
        python/subunit/tests/test_test_protocol.py \
        python/subunit/tests/test_test_results.py \
        runtests.py \
@@ -36,10 +42,6 @@ EXTRA_DIST =  \
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBUNIT_CFLAGS = -Wall -Werror -Wextra -Wstrict-prototypes -Wmissing-prototypes \
-       -Wwrite-strings -Wno-variadic-macros -I$(top_srcdir)/c/include
-AM_CFLAGS = $(SUBUNIT_CFLAGS)
-
 include_subunitdir = $(includedir)/subunit
 
 dist_bin_SCRIPTS = \
@@ -52,24 +54,30 @@ dist_bin_SCRIPTS = \
        filters/subunit2pyunit \
        filters/tap2subunit
 
-TESTS_ENVIRONMENT = SHELL_SHARE='$(top_srcdir)/shell/share/' PYTHONPATH='$(abs_top_srcdir)/python':${PYTHONPATH} 
+TESTS_ENVIRONMENT = SHELL_SHARE='$(top_srcdir)/shell/share/' PYTHONPATH='$(abs_top_srcdir)/python':${PYTHONPATH}
 TESTS = runtests.py $(check_PROGRAMS)
 
 ## install libsubunit.pc
 pcdatadir = $(libdir)/pkgconfig
-pcdata_DATA = libsubunit.pc
+pcdata_DATA = \
+       libsubunit.pc \
+       libcppunit_subunit.pc
 
 pkgpython_PYTHON = \
        python/subunit/__init__.py \
+       python/subunit/chunked.py \
+       python/subunit/details.py \
        python/subunit/iso8601.py \
        python/subunit/progress_model.py \
        python/subunit/run.py \
        python/subunit/test_results.py
 
 lib_LTLIBRARIES = libsubunit.la
+lib_LTLIBRARIES +=  libcppunit_subunit.la
 
 include_subunit_HEADERS = \
-       c/include/subunit/child.h
+       c/include/subunit/child.h \
+       c++/SubunitTestProgressListener.h
 
 check_PROGRAMS = \
        c/tests/test_child
@@ -81,8 +89,12 @@ libsubunit_la_SOURCES = \
        c/lib/child.c \
        c/include/subunit/child.h
 
+libcppunit_subunit_la_SOURCES = \
+       c++/SubunitTestProgressListener.cpp \
+       c++/SubunitTestProgressListener.h
+
 tests_LDADD = @CHECK_LIBS@ $(top_builddir)/libsubunit.la
-c_tests_test_child_CFLAGS = $(SUBUNIT_CFLAGS) @CHECK_CFLAGS@
+c_tests_test_child_CFLAGS = -I$(top_srcdir)/c/include $(SUBUNIT_CFLAGS) @CHECK_CFLAGS@
 c_tests_test_child_LDADD = $(tests_LDADD)
 
 
@@ -93,7 +105,7 @@ check-local: perl/Makefile
        $(MAKE) -C perl check
 
 clean-local:
-       find . -name "*.pyc" | xargs -r rm
+       find . -type f -name "*.pyc" -exec rm {} ';'
        rm -f perl/Makefile
 
 # Remove perl dir for VPATH builds.