summaryrefslogtreecommitdiff
path: root/hunspell/makefile.mk
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-03-04 09:51:42 +0000
committerOliver Bolte <obo@openoffice.org>2009-03-04 09:51:42 +0000
commitdcb1a804eb3318f915350b2ac98c7f0fb8856f14 (patch)
tree81b28e38cbc97a15bff612a72eb7b79599f794b7 /hunspell/makefile.mk
parentddb65ab936e294f8ddd76ca3c206045652d9ca33 (diff)
CWS-TOOLING: integrate CWS hunspell4thesaurus
2009-02-02 16:45:01 +0100 hjs r267278 : #i98415# - kick touch here - go for the root cause elsewhere 2009-02-02 12:09:15 +0100 hjs r267257 : #i98415# - fix parameters of touch 2009-01-23 23:13:00 +0100 mba r266855 : fixed warning 2009-01-23 18:59:55 +0100 mba r266848 : #i98415#: touch copied files 2009-01-21 09:58:05 +0100 nemeth r266633 : CWS-TOOLING: rebase CWS hunspell4thesaurus to trunk@266428 (milestone: DEV300:m39) 2009-01-21 09:04:48 +0100 nemeth r266629 : Issue: #19563 Submitted by: nemeth Reviewed by: nemeth Patch: handle bad dictionary items for back compatibility (affix separator without affix flags) 2009-01-20 20:04:10 +0100 nemeth r266622 : Issue: #19563 Submitted by: nemeth Reviewed by:nemeth Add two small fixes for SF.net Hunspell Bug ID 2487684 2519814 2008-12-10 00:21:41 +0100 nemeth r265141 : CWS-TOOLING: rebase CWS hunspell4thesaurus to trunk@264807 (milestone: DEV300:m37) 2008-12-09 16:12:56 +0100 nemeth r265113 : #i19563#: fixed stemming, and #i90028#: fixed and improved hyphenation 2008-11-26 23:09:05 +0100 nemeth r264438 : #i90028#: CWS hunspell4thesaurus: Windows fixes of the Hunspell patch. 2008-11-26 22:51:03 +0100 nemeth r264436 : CWS-TOOLING: rebase CWS hunspell4thesaurus to trunk@264325 (milestone: DEV300:m36) 2008-11-22 09:02:20 +0100 nemeth r264182 : CWS-TOOLING: rebase CWS hunspell4thesaurus to trunk@263288 (milestone: DEV300:m35) 2008-11-22 08:23:10 +0100 nemeth r264181 : CWS-TOOLING: rebase CWS hunspell4thesaurus to trunk@263288 (milestone: DEV300:m35) 2008-11-21 22:15:21 +0100 nemeth r264176 : #i90028#: migrate CWS hunspell4thesaurus to SVN.
Diffstat (limited to 'hunspell/makefile.mk')
-rw-r--r--hunspell/makefile.mk29
1 files changed, 7 insertions, 22 deletions
diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk
index 0032166c83f6..d0d60abc672b 100644
--- a/hunspell/makefile.mk
+++ b/hunspell/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.9 $
+# $Revision: 1.6.4.1 $
#
# This file is part of OpenOffice.org.
#
@@ -40,12 +40,12 @@ TARGET=hunspell
# --- Files --------------------------------------------------------
-TARFILE_NAME=hunspell-1.1.12-2
-TARFILE_ROOTDIR=hunspell-1.1.12
+TARFILE_NAME=hunspell-1.2.8
+TARFILE_ROOTDIR=hunspell-1.2.8
#ADDITIONAL_FILES += src/hunspell/makefile.mk
-PATCH_FILES=hunspell-1.1.12.patch
+PATCH_FILE_NAME=hunspell-1.2.8.patch
.IF "$(GUI)"=="UNX"
#CONFIGURE_DIR=$(BUILD_DIR)
@@ -57,36 +57,21 @@ CONFIGURE_FLAGS= --disable-shared --with-pic
CONFIGURE_FLAGS+= CFLAGS=-xc99=none
.ENDIF # "$(COMNAME)"=="sunpro5"
-.IF "$(COM)"=="C52" && "$(CPU)"=="U"
-LCL_CONFIGURE_CFLAGS+=-m64
-.ENDIF
-
.IF "$(SYSBASE)"!=""
.IF "$(EXTRA_CFLAGS)"!=""
-LCL_CONFIGURE_CFLAGS+=$(EXTRA_CFLAGS)
-.ENDIF # "$(EXTRA_CFLAGS)"!=""
+CONFIGURE_FLAGS+= CFLAGS="$(EXTRA_CFLAGS)" CXXFLAGS="$(EXTRA_CFLAGS)"
.ENDIF # "$(SYSBASE)"!=""
-
-.IF "$(LCL_CONFIGURE_CFLAGS)"!=""
-CONFIGURE_FLAGS+=CFLAGS='$(LCL_CONFIGURE_CFLAGS)' CXXFLAGS='$(LCL_CONFIGURE_CFLAGS)'
-.ENDIF
+.ENDIF # "$(EXTRA_CFLAGS)"!=""
BUILD_ACTION=make && make check
-OUT2LIB=$(BUILD_DIR)$/src$/hunspell$/.libs$/libhunspell-1.1.a
+OUT2LIB=$(BUILD_DIR)$/src$/hunspell$/.libs$/libhunspell-1.2.a
.ENDIF # "$(GUI)"=="UNX"
.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-CONFIGURE_ACTION=configure
-CONFIGURE_FLAGS= --disable-shared --with-pic
-BUILD_ACTION=make
-OUT2LIB=$(BUILD_DIR)$/src$/hunspell$/.libs$/libhunspell-1.1.a
-.ELSE
BUILD_ACTION=cd src/hunspell && dmake
-.ENDIF
.ENDIF # "$(GUI)"=="WNT"
.IF "$(GUI)"=="OS2"