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 a0c646635d67d06cee96f90d35bd5e54783792cb..6f53a6de811231d8fae157af9b0d8e7a83f66c8d 100644 (file)
--- 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 40bb36bf3e116959ebed7218fdb5020bcf473226..1a8e53208688b532ec44033fb32c262a518451c4 100644 (file)
--- 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 87ee91d50a603600ee852bbdc52a81ae1593cbf7..48e161d448aa42a652153bbcf7a09041c6e7064b 100644 (file)
--- 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 e285e6b2e499c449d12cee411662563ef2d72c03..49931d9d61b770686970e0c87f266aa1f904f787 100644 (file)
--- 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 518022522d00187741f82b5e75afcbac2fa7da80..f262389314168a0da1feeb21dd0a578dfc295d40 100644 (file)
--- 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