Autoconf changes for 2.01

git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@115 d0cd1f9f-072b-0410-8dd7-cf729c803f20
lzpfmh · Aug 30, 2007 · 6f27137 · 6f27137
1 parent eaef4c9
commit 6f27137
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -372,6 +372,8 @@ dist-hook:
 # added using EXTRA_DIST. $(distdir)/tessdata would in
 # theory suffice.
 	rm -rf `find $(distdir) -name CVS`
+	rm -rf `find $(distdir) -name .svn`
+	rm -rf `find $(distdir) -name .deps`
 # Also remove extra files not needed in a distribution
 	rm -rf `find $(distdir) -name configure.ac`
 	rm -rf `find $(distdir) -name acinclude.m4`

diff --git a/ccutil/Makefile.in b/ccutil/Makefile.in
@@ -77,11 +77,11 @@ VERSION = @VERSION@
 SUBDIRS = 
 AM_CXXFLAGS = -DTESSDATA_PREFIX=@datadir@/
 
-include_HEADERS =      basedir.h bits16.h clst.h debugwin.h elst2.h elst.h errcode.h     fileerr.h tessopt.h globaloc.h hashfn.h host.h hosthplb.h lsterr.h     mainblk.h memblk.h memryerr.h memry.h mfcpch.h ndminx.h notdll.h     nwmain.h ocrclass.h ocrshell.h platform.h secname.h serialis.h     stderr.h strngs.h tessclas.h tprintf.h varable.h     mfcpch.cpp scanutils.cpp scanutils.h unichar.h     unicharmap.h unicharset.h
+include_HEADERS =      basedir.h bits16.h clst.h debugwin.h elst2.h elst.h errcode.h     fileerr.h tessopt.h globaloc.h hashfn.h host.h hosthplb.h lsterr.h     mainblk.h memblk.h memryerr.h memry.h mfcpch.h ndminx.h notdll.h     nwmain.h ocrclass.h ocrshell.h platform.h secname.h serialis.h     stderr.h strngs.h tessclas.h tprintf.h varable.h     mfcpch.cpp scanutils.cpp scanutils.h unichar.h     unicharmap.h unicharset.h boxread.h
 
 
 lib_LIBRARIES = libtesseract_ccutil.a
-libtesseract_ccutil_a_SOURCES =      basedir.cpp bits16.cpp clst.cpp debugwin.cpp elst.cpp     elst2.cpp errcode.cpp globaloc.cpp hashfn.cpp mainblk.cpp     memblk.cpp memry.cpp ocrshell.cpp serialis.cpp strngs.cpp     tprintf.cpp varable.cpp unichar.cpp tessopt.cpp     unicharmap.cpp unicharset.cpp
+libtesseract_ccutil_a_SOURCES =      basedir.cpp bits16.cpp clst.cpp debugwin.cpp elst.cpp     elst2.cpp errcode.cpp globaloc.cpp hashfn.cpp mainblk.cpp     memblk.cpp memry.cpp ocrshell.cpp serialis.cpp strngs.cpp     tprintf.cpp varable.cpp unichar.cpp tessopt.cpp     unicharmap.cpp unicharset.cpp boxread.cpp
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_HEADER = ../config_auto.h
@@ -97,7 +97,7 @@ libtesseract_ccutil_a_LIBADD =
 libtesseract_ccutil_a_OBJECTS =  basedir.o bits16.o clst.o debugwin.o \
 elst.o elst2.o errcode.o globaloc.o hashfn.o mainblk.o memblk.o memry.o \
 ocrshell.o serialis.o strngs.o tprintf.o varable.o unichar.o tessopt.o \
-unicharmap.o unicharset.o
+unicharmap.o unicharset.o boxread.o
 AR = ar
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -112,7 +112,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
 GZIP_ENV = --best
-DEP_FILES =  .deps/basedir.P .deps/bits16.P .deps/clst.P \
+DEP_FILES =  .deps/basedir.P .deps/bits16.P .deps/boxread.P .deps/clst.P \
 .deps/debugwin.P .deps/elst.P .deps/elst2.P .deps/errcode.P \
 .deps/globaloc.P .deps/hashfn.P .deps/mainblk.P .deps/memblk.P \
 .deps/memry.P .deps/ocrshell.P .deps/serialis.P .deps/strngs.P \

diff --git a/classify/extern.h b/classify/extern.h
@@ -27,9 +27,6 @@
  ********************************************************************************
  */
 
-#ifdef __cplusplus
 #define EXTERN extern
-#else
-#define EXTERN extern
-#endif
+
 #endif
diff --git a/tessdata/configs/Makefile.in b/tessdata/configs/Makefile.in
@@ -74,8 +74,8 @@ RANLIB = @RANLIB@
 VERSION = @VERSION@
 
 datadir = @datadir@/tessdata/configs
-data_DATA = inter makebox box.train unlv
-EXTRA_DIST = inter makebox box.train unlv
+data_DATA = inter makebox box.train unlv api_config
+EXTRA_DIST = inter makebox box.train unlv api_config
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_HEADER = ../../config_auto.h
 CONFIG_CLEAN_FILES = 

diff --git a/testing/Makefile b/testing/Makefile
@@ -69,7 +69,7 @@ MAKEINFO = /home/rays/src/opensrc/tesseract-ocr/config/missing makeinfo
 PACKAGE = 
 PACKAGE_DATE = 07/2007
 PACKAGE_NAME = tesseract
-PACKAGE_VERSION = 2.00
+PACKAGE_VERSION = 2.01
 PACKAGE_YEAR = 2007
 RANLIB = ranlib
 VERSION =