fix Parallel Build Trees (a.k.a. VPATH Builds) ('make install-langs' and 'make install-jars')

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

Makefile.am

@@ -12,7 +12,7 @@ training:
 	@echo "Need to reconfigure project, so there are no errors"
 endif
 
-.PHONY: install-langs ScrollView.jar $(TRAINING_SUBDIR)
+.PHONY: install-langs ScrollView.jar install-jars $(TRAINING_SUBDIR)
 
 SUBDIRS = ccutil viewer cutil image ccstruct dict classify wordrec neural_networks/runtime textord cube ccmain api . tessdata
 
@@ -37,16 +37,20 @@ dist-hook:
 #       data files)
 # 'make install LANGS=' will install libraries, programs and  all 
 #       language datafiles in tessdata/
-# 'make install LANGS="eng ara deu"' will install only English, Arabic 
-#       and German language datafiles if they are present in tessdata/
+# 'make install LANGS="eng ara deu"' will install libraries, programs
+#       English, Arabic and German language datafiles if they are present
+#       in tessdata/
+# 'make install-langs LANGS="eng ara deu"' will install only English,
+#	Arabic and German language datafiles if they are present
+#       in tessdata/
 install-data-hook:
 	@if test $${LANGS+defined}; then \
-			if test "$${LANGS}" == ""; then \
-				echo ____All language files will be installed; \
-			else \
-				echo ___Folowing language files will be installed: "$$LANGS"; \
-			fi; \
-			cd "$(top_builddir)/tessdata" && $(MAKE) install-langs LANG="${LANGS}"; \
+		if test "$${LANGS}" == ""; then \
+			echo ____All language files will be installed; \
+		else \
+			echo ___Folowing language files will be installed: "$$LANGS"; \
+		fi; \
+		cd "$(top_builddir)/tessdata" && $(MAKE) install-langs LANG="${LANGS}"; \
 	else \
 		echo No language file is installed.; \
 	fi;
@@ -57,6 +61,9 @@ install-langs:
 ScrollView.jar:
 	@cd "$(top_builddir)/java" && $(MAKE) $@
 
+install-jars:
+	@cd "$(top_builddir)/java" && $(MAKE) $@
+
 doc-dummy:
 
 doc: doc-dummy

java/Makefile.am

 SUBDIRS = com
+scrollview_path = @datadir@/tessdata
 
 JAVAC = javac
 JAR = jar
 
 if !GRAPHICS_DISABLED
 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
+	$(srcdir)/com/google/scrollview/ui/SVAbstractMenuItem.java \
+	$(srcdir)/com/google/scrollview/ui/SVCheckboxMenuItem.java \
+	$(srcdir)/com/google/scrollview/ui/SVEmptyMenuItem.java \
+	$(srcdir)/com/google/scrollview/events/SVEvent.java \
+	$(srcdir)/com/google/scrollview/events/SVEventHandler.java \
+	$(srcdir)/com/google/scrollview/events/SVEventType.java \
+	$(srcdir)/com/google/scrollview/ui/SVImageHandler.java \
+	$(srcdir)/com/google/scrollview/ui/SVMenuBar.java \
+	$(srcdir)/com/google/scrollview/ui/SVMenuItem.java \
+	$(srcdir)/com/google/scrollview/ui/SVPopupMenu.java \
+	$(srcdir)/com/google/scrollview/ui/SVSubMenuItem.java \
+	$(srcdir)/com/google/scrollview/ui/SVWindow.java \
+	$(srcdir)/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
+	$(srcdir)/com/google/scrollview/ui/SVAbstractMenuItem.class \
+	$(srcdir)/com/google/scrollview/ui/SVCheckboxMenuItem.class \
+	$(srcdir)/com/google/scrollview/ui/SVEmptyMenuItem.class \
+	$(srcdir)/com/google/scrollview/events/SVEvent.class \
+	$(srcdir)/com/google/scrollview/events/SVEventHandler.class \
+	$(srcdir)/com/google/scrollview/events/SVEventType.class \
+	$(srcdir)/com/google/scrollview/ui/SVImageHandler.class \
+	$(srcdir)/com/google/scrollview/ui/SVMenuBar.class \
+	$(srcdir)/com/google/scrollview/ui/SVMenuItem.class \
+	$(srcdir)/com/google/scrollview/ui/SVPopupMenu.class \
+	$(srcdir)/com/google/scrollview/ui/SVSubMenuItem.class \
+	$(srcdir)/com/google/scrollview/ui/SVWindow.class \
+	$(srcdir)/com/google/scrollview/ScrollView.class
 
 SCROLLVIEW_LIBS = \
-	piccolo-1.2.jar \
-	piccolox-1.2.jar
+	$(srcdir)/piccolo-1.2.jar \
+	$(srcdir)/piccolox-1.2.jar
 
-CLASSPATH = ./piccolo-1.2.jar:./piccolox-1.2.jar
+CLASSPATH = $(srcdir)/piccolo-1.2.jar:$(srcdir)/piccolox-1.2.jar
 
 ScrollView.jar : $(SCROLLVIEW_CLASSES)
-	$(JAR) cf $@ com/google/scrollview/*.class \
-           com/google/scrollview/events/*.class com/google/scrollview/ui/*.class
+	$(JAR) cf $@ $(srcdir)/com/google/scrollview/*.class \
+           $(srcdir)/com/google/scrollview/events/*.class $(srcdir)/com/google/scrollview/ui/*.class
 
 $(SCROLLVIEW_CLASSES) : $(SCROLLVIEW_FILES)
 	$(JAVAC) -encoding UTF8 -classpath $(CLASSPATH) $(SCROLLVIEW_FILES) 
+
+.PHONY: install-jars
+install-jars : ScrollView.jar
+	@if [ ! -d  $(scrollview_path) ]; then mkdir -p $(scrollview_path); fi;
+	$(INSTALL) -m 644 $(srcdir)/*.jar $(scrollview_path);
+	$(INSTALL) -m 644 ScrollView.jar $(scrollview_path);
+	@echo "Don't forget to set eviroment variable SCROLLVIEW_PATH to $(scrollview_path)";
+
+uninstall:
+	rm -f $(scrollview_path)/*.jar
 endif
 
 clean :

tessdata/Makefile.am

@@ -47,7 +47,7 @@ install-langs:
 	@if test "${LANGS}" != ""; then \
 		for lang_code in ${LANGS}; do \
 			echo "installing data for $$lang_code"; \
-			$(INSTALL) -m 644 $$lang_code.* $(DESTDIR)$(datadir); \
+			$(INSTALL) -m 644 $(srcdir)/$$lang_code.* $(DESTDIR)$(datadir); \
 		done; \
 	else \
 		for l in ./*.traineddata; do \
@@ -58,7 +58,7 @@ install-langs:
 				break; \
 			fi; \
 			echo "installing data for $$lang_code"; \
-			$(INSTALL) -m 644 $$lang_code.* $(DESTDIR)$(datadir); \
+			$(INSTALL) -m 644 $(srcdir)/$$lang_code.* $(DESTDIR)$(datadir); \
 		done; \
 	fi;