1 files changed, 14 insertions, 2 deletions

diff --git a/xdelta3/Makefile.am b/xdelta3/Makefile.am
index 7d00a9b..11f75b0 100644
--- a/xdelta3/Makefile.am
+++ b/xdelta3/Makefile.am
@@ -1,7 +1,8 @@
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = subdir-objects
 
 bin_PROGRAMS = xdelta3
-noinst_PROGRAMS = xdelta3regtest xdelta3decode
+noinst_PROGRAMS = xdelta3regtest xdelta3decode xdelta3checksum
 
 export AFL_HARDEN
 
@@ -37,14 +38,19 @@ xdelta3regtest_SOURCES = $(common_SOURCES) \
         testing/sizes.h \
         testing/test.h
 
+xdelta3checksum_SOURCES = $(common_SOURCES) \
+        testing/checksum_test.cc \
+        testing/checksum_test_c.c
+
 # Note: for extra sanity checks, enable -Wconversion. Note there
 # are a lot of false positives.
 WFLAGS = -Wall -Wshadow -fno-builtin -Wextra -Wsign-compare \
-         -Wextra -Wno-unused-parameter -Wno-unused-function
+         -Wno-unused-parameter -Wformat -Wno-unused-function # -Wconversion
 
 C_WFLAGS = $(WFLAGS) -pedantic -std=c99
 CXX_WFLAGS = $(WFLAGS)
 
+# TODO add -O3
 common_CFLAGS = \
               -DREGRESSION_TEST=1 \
               -DSECONDARY_DJW=1 \
@@ -77,6 +83,12 @@ xdelta3regtest_CFLAGS = \
         $(C_WFLAGS) $(common_CFLAGS) -DNOT_MAIN=1 -DXD3_DEBUG=1
 xdelta3regtest_LDADD = -lm
 
+xdelta3checksum_CXXFLAGS = \
+        $(CXX_WFLAGS) $(common_CFLAGS) -DNOT_MAIN=1 -DXD3_MAIN=1 -std=c++11
+xdelta3checksum_CFLAGS = \
+        $(C_WFLAGS) $(common_CFLAGS) -DNOT_MAIN=1 -DXD3_MAIN=1
+
+
 man1_MANS = xdelta3.1
 
 EXTRA_DIST = \