fixed build in java directory; create documentation package with 'make doc-pack'

git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@705 d0cd1f9f-072b-0410-8dd7-cf729c803f20

INSTALL.SVN

@@ -1,3 +1,6 @@
+autotools (LINUX/UNIX...)
+======================
+
 If you have checked out Tesseract from Subversion, you must generate the 
 configure script.
 
@@ -19,3 +22,22 @@ If you want to install just few of them than run:
   $ make install LANGS="eng ara deu"
 It will install only English, Arabic and German language datafiles (if 
 they are present in tessdata directory)
+
+To compile ScrollView.jar you need to download piccolo.JAVA[1] from
+http://www.piccolo2d.org/download.html and extract 
+piccolo-1.2/build/piccolo.jar to tesseract/java as piccolo-1.2.jar and
+piccolo-1.2/build/piccolox.jar to tesseract/java as piccolo-1.2x.jar.
+
+Than run:
+  $ make ScrollView.jar
+
+and follow instruction on Viewer Debugging wiki[2].
+
+[1] http://www.cs.umd.edu/hcil/jazz/download/piccolo/piccolo-1.2-compiled.zip
+[2] http://code.google.com/p/tesseract-ocr/wiki/ViewerDebugging
+
+
+WINDOWS
+=======
+
+Please read vs2008/doc/index.html

Makefile.am

@@ -1,4 +1,5 @@
-+ACLOCAL_AMFLAGS = -I m4
+## run autogen.sh to create Makefile.in from this file
+ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = ccutil viewer cutil image ccstruct dict classify wordrec neural_networks/runtime textord cube ccmain api . java tessdata testing doc training
 
 #if USING_GETTEXT
@@ -40,6 +41,21 @@ install-data-hook:
 		echo No language file is installed.; \
 	fi;
 
-.PHONY: install-langs
+.PHONY: install-langs ScrollView.jar
 install-langs:
 	@cd "$(top_builddir)/tessdata" && $(MAKE) $@
+	
+ScrollView.jar:
+	@cd "$(top_builddir)/java" && $(MAKE) $@
+
+doc-dummy:
+
+doc: doc-dummy
+	-doxygen doc/Doxyfile
+
+doc-pack: doc
+	-chmod a+r $(top_srcdir)/doc/html/*
+	 @tar --create --directory=$(top_srcdir)/doc/html --verbose --file=- . | gzip -c -9 > $(top_srcdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@-doc-html.tar.gz;
+
+doc-clean:
+	rm -rf $(top_srcdir)/doc/html/*

java/Makefile.am

@@ -1,4 +1,53 @@
 SUBDIRS = com
 
-EXTRA_DIST = \
-    makefile
+JAVAC = javac
+JAR = jar
+
+SCROLLVIEW_FILES = \
+	com/google/scrollview/ui/SVAbstractMenuItem.java \
+	com/google/scrollview/ui/SVCheckboxMenuItem.java \
+	com/google/scrollview/ui/SVEmptyMenuItem.java \
+	com/google/scrollview/events/SVEvent.java \
+	com/google/scrollview/events/SVEventHandler.java \
+	com/google/scrollview/events/SVEventType.java \
+	com/google/scrollview/ui/SVImageHandler.java \
+	com/google/scrollview/ui/SVMenuBar.java \
+	com/google/scrollview/ui/SVMenuItem.java \
+	com/google/scrollview/ui/SVPopupMenu.java \
+	com/google/scrollview/ui/SVSubMenuItem.java \
+	com/google/scrollview/ui/SVWindow.java \
+	com/google/scrollview/ScrollView.java
+
+SCROLLVIEW_CLASSES = \
+	com/google/scrollview/ui/SVAbstractMenuItem.class \
+	com/google/scrollview/ui/SVCheckboxMenuItem.class \
+	com/google/scrollview/ui/SVEmptyMenuItem.class \
+	com/google/scrollview/events/SVEvent.class \
+	com/google/scrollview/events/SVEventHandler.class \
+	com/google/scrollview/events/SVEventType.class \
+	com/google/scrollview/ui/SVImageHandler.class \
+	com/google/scrollview/ui/SVMenuBar.class \
+	com/google/scrollview/ui/SVMenuItem.class \
+	com/google/scrollview/ui/SVPopupMenu.class \
+	com/google/scrollview/ui/SVSubMenuItem.class \
+	com/google/scrollview/ui/SVWindow.class \
+	com/google/scrollview/ScrollView.class
+
+SCROLLVIEW_LIBS = \
+	piccolo-1.2.jar \
+	piccolox-1.2.jar
+
+CLASSPATH = ./piccolo-1.2.jar:./piccolox-1.2.jar
+
+ScrollView.jar : $(SCROLLVIEW_CLASSES)
+	$(JAR) cf $@ com/google/scrollview/*.class \
+           com/google/scrollview/events/*.class com/google/scrollview/ui/*.class
+
+$(SCROLLVIEW_CLASSES) : $(SCROLLVIEW_FILES)
+	$(JAVAC) -encoding UTF8 -classpath $(CLASSPATH) $(SCROLLVIEW_FILES) 
+
+clean :
+	rm -f ScrollView.jar *.class
+
+# all-am does nothing, to make the java part optional.
+all all-am install :

java/makefile

@@ -1,58 +0,0 @@
-JAVAC = javac
-JAR = jar
-
-SCROLLVIEW_FILES = \
-com/google/scrollview/ui/SVAbstractMenuItem.java \
-com/google/scrollview/ui/SVCheckboxMenuItem.java \
-com/google/scrollview/ui/SVEmptyMenuItem.java \
-com/google/scrollview/events/SVEvent.java \
-com/google/scrollview/events/SVEventHandler.java \
-com/google/scrollview/events/SVEventType.java \
-com/google/scrollview/ui/SVImageHandler.java \
-com/google/scrollview/ui/SVMenuBar.java \
-com/google/scrollview/ui/SVMenuItem.java \
-com/google/scrollview/ui/SVPopupMenu.java \
-com/google/scrollview/ui/SVSubMenuItem.java \
-com/google/scrollview/ui/SVWindow.java \
-com/google/scrollview/ScrollView.java
-
-SCROLLVIEW_CLASSES = \
-com/google/scrollview/ui/SVAbstractMenuItem.class \
-com/google/scrollview/ui/SVCheckboxMenuItem.class \
-com/google/scrollview/ui/SVEmptyMenuItem.class \
-com/google/scrollview/events/SVEvent.class \
-com/google/scrollview/events/SVEventHandler.class \
-com/google/scrollview/events/SVEventType.class \
-com/google/scrollview/ui/SVImageHandler.class \
-com/google/scrollview/ui/SVMenuBar.class \
-com/google/scrollview/ui/SVMenuItem.class \
-com/google/scrollview/ui/SVPopupMenu.class \
-com/google/scrollview/ui/SVSubMenuItem.class \
-com/google/scrollview/ui/SVWindow.class \
-com/google/scrollview/ScrollView.class
-
-SCROLLVIEW_LIBS = \
-piccolo-1.2.jar \
-piccolox-1.2.jar
-
-CLASSPATH = ./piccolo-1.2.jar:./piccolox-1.2.jar
-
-ScrollView.jar : $(SCROLLVIEW_CLASSES)
-	$(JAR) cf $@ com/google/scrollview/*.class \
-           com/google/scrollview/events/*.class com/google/scrollview/ui/*.class
-
-$(SCROLLVIEW_CLASSES) : $(SCROLLVIEW_FILES)
-	$(JAVAC) -encoding UTF8 -classpath $(CLASSPATH) $(SCROLLVIEW_FILES) 
-
-clean :
-	rm -f ScrollView.jar *.class
-
-# all-am does nothing, to make the java part optional.
-all all-am install :
-
-# dist runs the autoconf makefile to archive the files correctly.
-dist distdir :
-	make -f Makefile $@
-uninstall uninstall-am:
-	make -f Makefile $@
-