summaryrefslogtreecommitdiff
path: root/libtextcat
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-09-23 16:03:40 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-09-23 16:03:40 +0100
commit9011d8df49683829051f58b2dd7dee2453ab2605 (patch)
tree9c4b5956f56ac96761d9903706bf78a0dc738b0a /libtextcat
parenta1191b722dd729433d87e3833a7c9c85dd78524e (diff)
bump libexttextcat to 3.0.1
Diffstat (limited to 'libtextcat')
-rw-r--r--libtextcat/makefile.mk19
-rw-r--r--libtextcat/prj/d.lst6
2 files changed, 8 insertions, 17 deletions
diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
index 3578afdd7ab1..7dc2dfdcb9a8 100644
--- a/libtextcat/makefile.mk
+++ b/libtextcat/makefile.mk
@@ -42,33 +42,24 @@ all:
# --- Files --------------------------------------------------------
-TARFILE_NAME=libexttextcat-3.0
-TARFILE_MD5=88ee686fd1ef31d89ce389c99008f7cf
-TARFILE_ROOTDIR=libexttextcat-3.0
+TARFILE_NAME=libexttextcat-3.0.1
+TARFILE_MD5=131b91de2d1df0ff5f0a8284b5417f8b
+TARFILE_ROOTDIR=libexttextcat-3.0.1
.IF "$(GUI)"=="UNX"
#relative to CONFIGURE_DIR
-CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
+CONFIGURE_ACTION=configure --disable-shared --with-pic CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
.IF "$(OS)"=="AIX"
CONFIGURE_FLAGS+= CFLAGS=-D_LINUX_SOURCE_COMPAT
.ENDIF
-.IF "$(OS)"=="IOS"
-CONFIGURE_FLAGS+= --disable-shared
-.ENDIF
.IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF
BUILD_ACTION=make
-.IF "$(OS)"=="ANDROID"
-# The libtool in the libtextcat-2.2 tarball doesn't build
-# shared libraries on Android, for some reason.
-OUT2LIB=$(BUILD_DIR)$/src$/.libs$/libtextcat*.a
-.ELSE
-OUT2LIB=$(BUILD_DIR)$/src$/.libs$/libtextcat*$(DLLPOST)
-.ENDIF
+OUT2LIB=$(BUILD_DIR)$/src$/.libs$/libtextcat.a
.ENDIF # "$(GUI)"=="UNX"
diff --git a/libtextcat/prj/d.lst b/libtextcat/prj/d.lst
index 23c3ac54a9fa..70a07bd193f1 100644
--- a/libtextcat/prj/d.lst
+++ b/libtextcat/prj/d.lst
@@ -4,8 +4,8 @@
..\%__SRC%\bin\l*.dll %_DEST%\bin\*.dll
mkdir: %_DEST%\inc\external\libtextcat
-..\%__SRC%\misc\build\libexttextcat-3.0\src\*.h %_DEST%\inc\external\libtextcat\*.h
+..\%__SRC%\misc\build\libexttextcat-3.0.1\src\*.h %_DEST%\inc\external\libtextcat\*.h
# data for language guessing
-..\%__SRC%\misc\build\libexttextcat-3.0\langclass\fpdb.conf %COMMON_DEST%\pck\fpdb.conf
-..\%__SRC%\misc\build\libexttextcat-3.0\langclass\LM\*.lm %COMMON_DEST%\pck\*.lm
+..\%__SRC%\misc\build\libexttextcat-3.0.1\langclass\fpdb.conf %COMMON_DEST%\pck\fpdb.conf
+..\%__SRC%\misc\build\libexttextcat-3.0.1\langclass\LM\*.lm %COMMON_DEST%\pck\*.lm