Commit for release to 1.5.29.

[asdcplib.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 17537b08f2c960ff90c96820ab8ffcc7588878dc..f38b3c6f9d39364ac0638ba6c70ddd341ff4e1d6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,7 +43,7 @@ include_HEADERS = KM_error.h KM_fileio.h KM_log.h KM_memio.h KM_mutex.h \
                KM_platform.h KM_prng.h KM_util.h KM_xml.h AS_DCP.h
 if DEV_HEADERS
 include_HEADERS += S12MTimecode.h MDD.h Metadata.h KLV.h MXFTypes.h MXF.h Wav.h \
-               PCMParserList.h asdcp_wrappers.h
+               PCMParserList.h TimedText_Transform.h
 endif
 
 # list of the libraries to build and install
@@ -69,6 +69,9 @@ libasdcp_la_SOURCES = MPEG2_Parser.cpp MPEG.cpp JP2K_Codestream_Parser.cpp \
                Wav.h WavFileWriter.h MXF.h Metadata.h \
                JP2K.h AS_DCP.h AS_DCP_internal.h KLV.h MPEG.h MXFTypes.h MDD.h \
                PCMParserList.h S12MTimecode.h MDD.cpp
+if DEV_HEADERS
+libasdcp_la_SOURCES += TimedText_Transform.cpp
+endif
 
 libasdcp_la_LDFLAGS = -release @VERSION@
 
@@ -83,6 +86,7 @@ lib_LTLIBRARIES += libpyasdcp.la
 nodist_libpyasdcp_la_SOURCES = asdcp_python.cpp asdcp_python.h \
                asdcp_python_writerinfo.h asdcp_python_misc.cpp \
                asdcp_python_reader.cpp asdcp_python_writer.cpp asdcp_wrappers.h \
+               asdcp_python_descriptor.cpp \
                kumu_python.cpp kumu_python.h
 
 libpyasdcp_la_CPPFLAGS = @PYTHON_CPPFLAGS@
@@ -91,15 +95,15 @@ libpyasdcp_la_LIBADD = libkumu.la libasdcp.la
 
 pyexecdir = @PYTHON_EXECDIR@
 pyexec_includedir = $(PYTHON_PREFIX)/include/python$(PYTHON_SHORTVERSION)
-nodist_pyexec_include_HEADERS = kumu_python.h asdcp_python.h
+nodist_pyexec_include_HEADERS = kumu_python.h asdcp_python.h asdcp_wrappers.h
 pyexec_LTLIBRARIES = kumu.la asdcp.la
-nodist_kumu_la_SOURCES = pykumu.cpp kumu_python.h
 
+nodist_kumu_la_SOURCES = pykumu.cpp kumu_python.h
 kumu_la_CPPFLAGS = @PYTHON_CPPFLAGS@
 kumu_la_LDFLAGS = @PYTHON_LSPEC@ -avoid-version -module
 kumu_la_LIBADD = libpyasdcp.la
-nodist_asdcp_la_SOURCES = pyasdcp.cpp asdcp_python.h
 
+nodist_asdcp_la_SOURCES = pyasdcp.cpp asdcp_python.h asdcp_wrappers.h
 asdcp_la_CPPFLAGS = @PYTHON_CPPFLAGS@
 asdcp_la_LDFLAGS = @PYTHON_LSPEC@ -avoid-version -module
 asdcp_la_LIBADD = libpyasdcp.la
@@ -132,9 +136,8 @@ check_PROGRAMS = asdcp-mem-test path-test jp2k-test S429-5-cgi \
        fips-186-rng-test asdcp-version tt-xform
 
 # sources for a test program
-asdcp_mem_test_SOURCES = asdcp-mem-test.cpp
-
 # list of libraries to link against for a test program
+asdcp_mem_test_SOURCES = asdcp-mem-test.cpp
 asdcp_mem_test_LDADD = libasdcp.la
 path_test_SOURCES = path-test.cpp
 path_test_LDADD = libkumu.la
@@ -147,7 +150,7 @@ fips_186_rng_test_LDADD = libasdcp.la
 asdcp_version_SOURCES = asdcp-version.cpp
 asdcp_version_LDADD = libkumu.la
 tt_xform_SOURCES = tt-xform.cpp TimedText_Transform.h TimedText_Transform.cpp
-tt_xform_LDADD = libkumu.la
+tt_xform_LDADD = libasdcp.la
 
 
 # list of test scripts to execute during "make check"