Refactored to use new TurboJPEG API and new BMP library + additional cleanup. There is no legacy code remaining, so the refactored version of the program has been re-licensed under a BSD-style license.
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@629 632fc199-4ca6-4c93-a231-07263d6284db
diff --git a/Makefile.am b/Makefile.am
index 8ba8185..a5e58f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -77,11 +77,14 @@
bin_PROGRAMS = cjpeg djpeg jpegtran rdjpgcom wrjpgcom jpgtest
noinst_PROGRAMS = jpegut
-jpgtest_SOURCES = $(TSTHDRS) jpgtest.c bmp.h bmp.c
+jpgtest_SOURCES = $(TSTHDRS) jpgtest.c bmp.h bmp.c tjutil.h tjutil.c \
+ rdbmp.c rdppm.c wrbmp.c wrppm.c
-jpgtest_LDADD = libturbojpeg.la -lm
+jpgtest_LDADD = libturbojpeg.la libjpeg.la -lm
-jpegut_SOURCES = $(TSTHDRS) jpegut.c bmp.h bmp.c tjutil.h tjutil.c
+jpgtest_CFLAGS = -DBMP_SUPPORTED -DPPM_SUPPORTED
+
+jpegut_SOURCES = $(TSTHDRS) jpegut.c tjutil.h tjutil.c
jpegut_LDADD = libturbojpeg.la