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

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

diff --git a/Makefile.am b/Makefile.am
index b06da6eca3c3b8cdc5d99c664e2dec2de9c84cf9..281159e97d2e2508a1e55185a500cf707b9a85ce 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,16 +37,16 @@ endif
 libturbojpeg_la_SOURCES = $(libjpeg_la_SOURCES) turbojpegl.c turbojpeg.h \
        transupp.c transupp.h
 
+SUBDIRS = java
+
 if WITH_JAVA
 
-SUBDIRS = java
 libturbojpeg_la_SOURCES += turbojpeg-jni.c
 libturbojpeg_la_CFLAGS = ${JNI_CFLAGS}
 TJMAPFILE = turbojpeg-mapfile.jni
 
 else
 
-SUBDIRS =
 TJMAPFILE = turbojpeg-mapfile
 
 endif
@@ -126,7 +126,7 @@ TESTFILES= testorig.jpg testorig.ppm testimg.bmp testimgflt.jpg \
        testimgint.ppm testimgflt-nosimd.jpg testimgcrop.jpg testimgari.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
 
 dist-hook:

diff --git a/configure.ac b/configure.ac
index 6c483e6a40fd12588e0ba2b19bb62972211a6eca..545418175f7c341fc36faff277ab90dad1d751cc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -327,7 +327,5 @@ AC_CONFIG_FILES([pkgscripts/makesunpkg:release/makesunpkg.in])
 AC_CONFIG_FILES([pkgscripts/pkginfo:release/pkginfo.in])
 AC_CONFIG_FILES([libjpeg.map])
 AC_CONFIG_FILES([Makefile simd/Makefile])
-if test "x$with_java" = "xyes"; then
-  AC_CONFIG_FILES([java/Makefile])
-fi
+AC_CONFIG_FILES([java/Makefile])
 AC_OUTPUT

diff --git a/java/Makefile.am b/java/Makefile.am
index 647c165ce6af964a52ed22bcc493569fec0012d1..9afa74cdece610dfa4d9ca100b2f0ba1af3aff27 100644 (file)
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -1,6 +1,6 @@
 JAVAROOT = .
 
-dist_noinst_JAVA = org/libjpegturbo/turbojpeg/TJ.java \
+JAVASOURCES = org/libjpegturbo/turbojpeg/TJ.java \
        org/libjpegturbo/turbojpeg/TJCompressor.java \
        org/libjpegturbo/turbojpeg/TJDecompressor.java \
        org/libjpegturbo/turbojpeg/TJTransform.java \
@@ -8,6 +8,15 @@ dist_noinst_JAVA = org/libjpegturbo/turbojpeg/TJ.java \
        TJExample.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 \
        org/libjpegturbo/turbojpeg/TJCompressor.class \
        org/libjpegturbo/turbojpeg/TJDecompressor.class \
@@ -32,3 +41,7 @@ install-exec-local: turbojpeg.jar
 uninstall-local:
        rm -f $(DESTDIR)/$(prefix)/classes/turbojpeg.jar
        if [ -d $(DESTDIR)/$(prefix)/classes ]; then rmdir $(DESTDIR)/$(prefix)/classes; fi
+
+endif
+
+EXTRA_DIST = MANIFEST.MF ${JAVASOURCES} ${JNIHEADERS} doc