Convert the CPPUnit patch to a library usable with CPPUnit.

[third_party/subunit] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3bf72f1638a1eb65a900413fe752c6d792e69267..e2dca58ad01675d8caa28e1f41ae8ca702f43da7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,12 @@ EXTRA_DIST =  \
        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 \
        python/subunit/tests/TestUtil.py \
        python/subunit/tests/__init__.py \
@@ -19,6 +24,7 @@ EXTRA_DIST =  \
        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 \
@@ -33,6 +39,9 @@ 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)
+SUBUNIT_CXXFLAGS = -Wall -Werror -Wextra -Wwrite-strings -Wno-variadic-macros \
+       -I$(top_srcdir)/c/include
+AM_CXXFLAGS = $(SUBUNIT_CXXFLAGS)
 
 include_subunitdir = $(includedir)/subunit
 
@@ -51,18 +60,23 @@ 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/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
@@ -70,13 +84,52 @@ check_PROGRAMS = \
 check_SCRIPTS = \
        runtests.py
 
-clean-local:
-       find . -name "*.pyc" | xargs -r rm
-
 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_LDADD = $(tests_LDADD)
+
+
+all-local: perl/Makefile
+       $(MAKE) -C perl all
+
+check-local: perl/Makefile
+       $(MAKE) -C perl check
+
+clean-local:
+       find . -name "*.pyc" | xargs -r rm
+       rm -f perl/Makefile
+
+# Remove perl dir for VPATH builds.
+distclean-local:
+       -rmdir perl > /dev/null
+       -rm perl/Makefile.PL > /dev/null
+
+install-exec-local: perl/Makefile
+       $(MAKE) -C perl install
+
+mostlyclean-local:
+       rm -rf perl/blib
+       rm -rf perl/pm_to_blib
+
+# 'uninstall' perl files during distcheck
+uninstall-local:
+       if [ "_inst" = `basename ${prefix}` ]; then \
+         $(MAKE) -C perl uninstall_distcheck; \
+           rm -f "$(DESTDIR)$(bindir)"/subunit-diff; \
+       fi
+
+# The default for MakeMaker; can be overridden by exporting
+INSTALLDIRS ?= site
+
+perl/Makefile: perl/Makefile.PL
+       mkdir -p perl
+       cd perl && perl Makefile.PL INSTALLDIRS=${INSTALLDIRS}
+       -rm perl/Makefile.old > /dev/null