ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 'make dist' so that it includes only what we need from java/ (it was errantly including java/Makefile)

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@550 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2011-04-01 00:37:20 +00:00
parent f2602ce567
commit dffd53da5d
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@@ -37,16 +37,16 @@ endif
libturbojpeg_la_SOURCES = $(libjpeg_la_SOURCES) turbojpegl.c turbojpeg.h \ libturbojpeg_la_SOURCES = $(libjpeg_la_SOURCES) turbojpegl.c turbojpeg.h \
transupp.c transupp.h transupp.c transupp.h
SUBDIRS = java
if WITH_JAVA if WITH_JAVA
SUBDIRS = java
libturbojpeg_la_SOURCES += turbojpeg-jni.c libturbojpeg_la_SOURCES += turbojpeg-jni.c
libturbojpeg_la_CFLAGS = ${JNI_CFLAGS} libturbojpeg_la_CFLAGS = ${JNI_CFLAGS}
TJMAPFILE = turbojpeg-mapfile.jni TJMAPFILE = turbojpeg-mapfile.jni
else else
SUBDIRS =
TJMAPFILE = turbojpeg-mapfile TJMAPFILE = turbojpeg-mapfile
endif endif
@@ -126,7 +126,7 @@ TESTFILES= testorig.jpg testorig.ppm testimg.bmp testimgflt.jpg \
testimgint.ppm testimgflt-nosimd.jpg testimgcrop.jpg testimgari.jpg \ testimgint.ppm testimgflt-nosimd.jpg testimgcrop.jpg testimgari.jpg \
testimgari.ppm testimgfst100.jpg testimggray.jpg testimgari.ppm testimgfst100.jpg testimggray.jpg
EXTRA_DIST = win release java $(DOCS) $(TESTFILES) CMakeLists.txt \ EXTRA_DIST = win release $(DOCS) $(TESTFILES) CMakeLists.txt \
sharedlib/CMakeLists.txt cmakescripts libjpeg.map.in sharedlib/CMakeLists.txt cmakescripts libjpeg.map.in
dist-hook: dist-hook:

4
configure.ac
View File

@@ -327,7 +327,5 @@ AC_CONFIG_FILES([pkgscripts/makesunpkg:release/makesunpkg.in])
AC_CONFIG_FILES([pkgscripts/pkginfo:release/pkginfo.in]) AC_CONFIG_FILES([pkgscripts/pkginfo:release/pkginfo.in])
AC_CONFIG_FILES([libjpeg.map]) AC_CONFIG_FILES([libjpeg.map])
AC_CONFIG_FILES([Makefile simd/Makefile]) AC_CONFIG_FILES([Makefile simd/Makefile])
if test "x$with_java" = "xyes"; then AC_CONFIG_FILES([java/Makefile])
AC_CONFIG_FILES([java/Makefile])
fi
AC_OUTPUT AC_OUTPUT

15
java/Makefile.am
View File

@@ -1,6 +1,6 @@
JAVAROOT = . JAVAROOT = .
dist_noinst_JAVA = org/libjpegturbo/turbojpeg/TJ.java \ JAVASOURCES = org/libjpegturbo/turbojpeg/TJ.java \
org/libjpegturbo/turbojpeg/TJCompressor.java \ org/libjpegturbo/turbojpeg/TJCompressor.java \
org/libjpegturbo/turbojpeg/TJDecompressor.java \ org/libjpegturbo/turbojpeg/TJDecompressor.java \
org/libjpegturbo/turbojpeg/TJTransform.java \ org/libjpegturbo/turbojpeg/TJTransform.java \
@@ -8,6 +8,15 @@ dist_noinst_JAVA = org/libjpegturbo/turbojpeg/TJ.java \
TJExample.java \ TJExample.java \
TJUnitTest.java TJUnitTest.java
JNIHEADERS = org_libjpegturbo_turbojpeg_TJ.h \
org_libjpegturbo_turbojpeg_TJCompressor.h \
org_libjpegturbo_turbojpeg_TJDecompressor.h \
org_libjpegturbo_turbojpeg_TJTransformer.h
if WITH_JAVA
dist_noinst_JAVA = ${JAVASOURCES}
JAVA_CLASSES = org/libjpegturbo/turbojpeg/TJ.class \ JAVA_CLASSES = org/libjpegturbo/turbojpeg/TJ.class \
org/libjpegturbo/turbojpeg/TJCompressor.class \ org/libjpegturbo/turbojpeg/TJCompressor.class \
org/libjpegturbo/turbojpeg/TJDecompressor.class \ org/libjpegturbo/turbojpeg/TJDecompressor.class \
@@ -32,3 +41,7 @@ install-exec-local: turbojpeg.jar
uninstall-local: uninstall-local:
rm -f $(DESTDIR)/$(prefix)/classes/turbojpeg.jar rm -f $(DESTDIR)/$(prefix)/classes/turbojpeg.jar
if [ -d $(DESTDIR)/$(prefix)/classes ]; then rmdir $(DESTDIR)/$(prefix)/classes; fi if [ -d $(DESTDIR)/$(prefix)/classes ]; then rmdir $(DESTDIR)/$(prefix)/classes; fi
endif
EXTRA_DIST = MANIFEST.MF ${JAVASOURCES} ${JNIHEADERS} doc