mo-better timed text

diff --git a/src/Makefile.am b/src/Makefile.am
index 17537b08f2c960ff90c96820ab8ffcc7588878dc..e41bc9062196c01207203f5b401dda0b79c4816c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -132,9 +132,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
@@ -146,8 +145,9 @@ fips_186_rng_test_SOURCES = fips-186-rng-test.cpp
 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 libkumu.la
 
 
 # list of test scripts to execute during "make check"

diff --git a/src/blackwave.cpp b/src/blackwave.cpp
index 137403898c8450ddec4f7ceec9e4f434687a0777..b58486691bc2f6fe6644aa6562e0e4026add9b44 100644 (file)
--- a/src/blackwave.cpp
+++ b/src/blackwave.cpp
@@ -57,11 +57,11 @@ banner(FILE* stream = stderr)
   fprintf(stream, "\n\
 %s (asdcplib %s)\n\n\
 Copyright (c) 2005-2006 John Hurst\n\n\
-wavesplit is part of asdcplib.\n\
+%s is part of asdcplib.\n\
 asdcplib may be copied only under the terms of the license found at\n\
 the top of every file in the asdcplib distribution kit.\n\n\
 Specify the -h (help) option for further information about %s\n\n",
-         PROGRAM_NAME, ASDCP::Version(), PROGRAM_NAME);
+         PROGRAM_NAME, ASDCP::Version(), PROGRAM_NAME, PROGRAM_NAME);
 }
 
 //

diff --git a/src/wavesplit.cpp b/src/wavesplit.cpp
index 0d472a1091d80215ea0f1f4a9d8437393c7397ee..f7030ca1d8ca3e4c9a18ad190d39a992a4ab2798 100755 (executable)
--- a/src/wavesplit.cpp
+++ b/src/wavesplit.cpp
@@ -70,11 +70,11 @@ banner(FILE* stream = stderr)
   fprintf(stream, "\n\
 %s (asdcplib %s)\n\n\
 Copyright (c) 2005-2009 John Hurst\n\n\
-wavesplit is part of asdcplib.\n\
+%s is part of asdcplib.\n\
 asdcplib may be copied only under the terms of the license found at\n\
 the top of every file in the asdcplib distribution kit.\n\n\
 Specify the -h (help) option for further information about %s\n\n",
-         PROGRAM_NAME, ASDCP::Version(), PROGRAM_NAME);
+         PROGRAM_NAME, ASDCP::Version(), PROGRAM_NAME, PROGRAM_NAME);
 }
 
 //