From: DRC <dcommander@users.sourceforge.net>
Date: Sat, 19 Feb 2011 00:00:34 +0000 (+0000)
Subject: Include jpgtest in Unix/Linux distribution packages
X-Git-Tag: 1.1.0~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=240d82f8be7cbba6638f0ae7c2f8fcdacc2b8096;p=libjpeg-turbo

Include jpgtest in Unix/Linux distribution packages


git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.1.x@408 632fc199-4ca6-4c93-a231-07263d6284db
---

diff --git a/ChangeLog.txt b/ChangeLog.txt
index a0c6466..6f53a6d 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -20,6 +20,11 @@ It also ensures that the library can avoid the performance pitfall created by
 [4] Fixed visual artifacts in grayscale JPEG compression caused by a typo in
 the RGB-to-chrominance lookup tables.
 
+[5] The Windows distribution packages now include the libjpeg run-time programs
+(cjpeg, etc.)
+
+[6] All packages now contain jpgtest.
+
 
 1.0.90 (1.1 beta1)
 ==================
diff --git a/Makefile.am b/Makefile.am
index 40bb36b..1a8e532 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,8 +63,8 @@ endif
 
 TSTHDRS = rrutil.h rrtimer.h
 
-bin_PROGRAMS = cjpeg djpeg jpegtran rdjpgcom wrjpgcom
-noinst_PROGRAMS = jpgtest jpegut
+bin_PROGRAMS = cjpeg djpeg jpegtran rdjpgcom wrjpgcom jpgtest
+noinst_PROGRAMS = jpegut
 
 jpgtest_SOURCES = $(TSTHDRS) jpgtest.c bmp.h bmp.c
 
diff --git a/release/libjpeg-turbo.spec.in b/release/libjpeg-turbo.spec.in
index 87ee91d..48e161d 100644
--- a/release/libjpeg-turbo.spec.in
+++ b/release/libjpeg-turbo.spec.in
@@ -75,6 +75,7 @@ rm -rf $RPM_BUILD_ROOT
 /opt/%{name}/bin/cjpeg
 /opt/%{name}/bin/djpeg
 /opt/%{name}/bin/jpegtran
+/opt/%{name}/bin/jpgtest
 /opt/%{name}/bin/rdjpgcom
 /opt/%{name}/bin/wrjpgcom
 %dir /opt/%{name}/%{__lib}
diff --git a/release/makemacpkg.in b/release/makemacpkg.in
index e285e6b..49931d9 100644
--- a/release/makemacpkg.in
+++ b/release/makemacpkg.in
@@ -102,6 +102,10 @@ if [ $UNIVERSAL = 1 ]; then
 		-arch i386 $TMPDIR/dist.x86/opt/$PACKAGE_NAME/bin/jpegtran \
 		-arch x86_64 $PKGROOT/opt/$PACKAGE_NAME/bin/jpegtran \
 		-output $PKGROOT/opt/$PACKAGE_NAME/bin/jpegtran
+	lipo -create \
+		-arch i386 $TMPDIR/dist.x86/opt/$PACKAGE_NAME/bin/jpgtest \
+		-arch x86_64 $PKGROOT/opt/$PACKAGE_NAME/bin/jpgtest \
+		-output $PKGROOT/opt/$PACKAGE_NAME/bin/jpgtest
 	lipo -create \
 		-arch i386 $TMPDIR/dist.x86/opt/$PACKAGE_NAME/bin/rdjpgcom \
 		-arch x86_64 $PKGROOT/opt/$PACKAGE_NAME/bin/rdjpgcom \
diff --git a/release/makesunpkg.in b/release/makesunpkg.in
index 5180225..f262389 100644
--- a/release/makesunpkg.in
+++ b/release/makesunpkg.in
@@ -81,6 +81,7 @@ d none $PACKAGE_NAME/bin 0755 root bin
 f none $PACKAGE_NAME/bin/cjpeg 0755 root bin
 f none $PACKAGE_NAME/bin/djpeg 0755 root bin
 f none $PACKAGE_NAME/bin/jpegtran 0755 root bin
+f none $PACKAGE_NAME/bin/jpgtest 0755 root bin
 f none $PACKAGE_NAME/bin/rdjpgcom 0755 root bin
 f none $PACKAGE_NAME/bin/wrjpgcom 0755 root bin
 d none $PACKAGE_NAME/lib 0755 root bin