version bump

[asdcplib.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 7f68518d2d2b276a8f3ee38ccae66183f45df516..a4a413407825006a5edfdce878143882c3da1a2f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -71,7 +71,7 @@ libasdcp_la_SOURCES = MPEG2_Parser.cpp MPEG.cpp JP2K_Codestream_Parser.cpp \
                JP2K.h AS_DCP.h AS_DCP_internal.h KLV.h MPEG.h MXFTypes.h MDD.h \
                PCMParserList.h S12MTimecode.h MDD.cpp
 
-if !FREEDIST
+if DEV_HEADERS
 nodist_libasdcp_la_SOURCES += TimedText_Transform.h TimedText_Transform.cpp
 endif
 
@@ -112,7 +112,7 @@ asdcp_la_LIBADD = libpyasdcp.la
 endif
 
 # list of programs to be built and installed
-bin_PROGRAMS = asdcp-test blackwave klvwalk kmfilegen kmrandgen \
+bin_PROGRAMS = asdcp-test j2c-test blackwave klvwalk kmfilegen kmrandgen \
                kmuuidgen wavesplit
 
 # sources for a program
@@ -132,11 +132,13 @@ klvwalk_SOURCES = klvwalk.cpp
 klvwalk_LDADD = libasdcp.la
 wavesplit_SOURCES = wavesplit.cpp
 wavesplit_LDADD = libasdcp.la
+j2c_test_SOURCES = j2c-test.cpp
+j2c_test_LDADD = libasdcp.la
 
 # list of programs that need to be compiled for use in test suite
-check_PROGRAMS = asdcp-mem-test path-test jp2k-test S429-5-cgi \
+check_PROGRAMS = asdcp-mem-test path-test S429-5-cgi \
        fips-186-rng-test asdcp-version
-if !FREEDIST
+if DEV_HEADERS
 check_PROGRAMS += tt-xform
 endif
 
@@ -146,15 +148,13 @@ 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
-jp2k_test_SOURCES = jp2k-test.cpp
-jp2k_test_LDADD = libasdcp.la
 S429_5_cgi_SOURCES = S429-5-cgi.cpp
 S429_5_cgi_LDADD = libasdcp.la
 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
-if !FREEDIST
+if DEV_HEADERS
 nodist_tt_xform_SOURCES = tt-xform.cpp
 tt_xform_LDADD = libasdcp.la
 endif
@@ -173,7 +173,9 @@ TESTS_ENVIRONMENT = BUILD_DIR="." TEST_FILES=../tests TEST_FILE_PREFIX=DCPd1-M1
 # files to include in the distribution that automake doesn't automatically include
 EXTRA_DIST = fips-186-test-harness.pl $(TESTS)
 if !FREEDIST
+if DEV_HEADERS
 EXTRA_DIST += $(nodist_libasdcp_la_SOURCES) $(nodist_tt_xform_SOURCES)
+endif
 if PYTHON_USE
 EXTRA_DIST += $(nodist_pyexec_include_HEADERS) $(nodist_libpyasdcp_la_SOURCES) $(nodist_kumu_la_SOURCES) $(nodist_asdcp_la_SOURCES)
 endif