Convert the CPPUnit patch to a library usable with CPPUnit.

[third_party/subunit] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f6a4eff174a0a5802849c697f1db2d8ea7d6f943..e2dca58ad01675d8caa28e1f41ae8ca702f43da7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,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
 
@@ -57,7 +60,9 @@ 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 \
@@ -67,9 +72,11 @@ pkgpython_PYTHON = \
        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,6 +88,10 @@ 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)