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


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 b06da6e..281159e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,16 +37,16 @@
 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 @@
 	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: