summaryrefslogtreecommitdiff
path: root/lingucomponent
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-06-13 13:08:48 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-06-13 13:08:48 +0000
commit25eb33963048760b49b0a854685d154045d3c4b7 (patch)
treee7bd8dcb5e5d3fb9e3f5c6b19cd3112564de9fc8 /lingucomponent
parent4d320c0988552ded4827e6ee2fc0781f34bb5bf0 (diff)
INTEGRATION: CWS hunspellexternal (1.16.8); FILE MERGED
2008/06/11 17:41:10 mh 1.16.8.5: add: icuuc for Win32 2008/04/22 14:16:23 cmc 1.16.8.4: rejig for dictmgr.hxx move 2008/04/22 06:39:45 rene 1.16.8.3: #i87604#, #i10000# fix the build with both internal and system hunspell 2008/04/21 09:30:21 rene 1.16.8.2: RESYNC: (1.17-1.20); FILE MERGED 2007/10/08 11:09:33 rene 1.16.8.1: add HUNSPELL BUILD_TYPE, make dictmgr.hxx used from hunspell, remove HUNSPELLIB from solenv/inc/libs.mk
Diffstat (limited to 'lingucomponent')
-rw-r--r--lingucomponent/source/spellcheck/spell/makefile.mk44
1 files changed, 10 insertions, 34 deletions
diff --git a/lingucomponent/source/spellcheck/spell/makefile.mk b/lingucomponent/source/spellcheck/spell/makefile.mk
index a6cd7948d8e5..039e6d881a76 100644
--- a/lingucomponent/source/spellcheck/spell/makefile.mk
+++ b/lingucomponent/source/spellcheck/spell/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.20 $
+# $Revision: 1.21 $
#
# This file is part of OpenOffice.org.
#
@@ -36,40 +36,19 @@ TARGET = spell
ENABLE_EXCEPTIONS=TRUE
USE_DEFFILE=TRUE
-.IF "$(HUNSPELL_LIBS)"!=""
-HUNSPELLLIB=$(HUNSPELL_LIBS)
-.ENDIF
-
-.IF "$(ULINGULIB)"==""
-.IF "$(GUI)"=="UNX"
-ULINGULIB=-lulingu
-.ENDIF # unx
-.IF "$(GUI)"=="OS2"
-ULINGULIB=$(SLB)\libulingu.lib
-.ENDIF
-.IF "$(GUI)"=="WNT"
-ULINGULIB=libulingu.lib
-.ENDIF # wnt
+.IF "$(SYSTEM_HUNSPELL)" != "YES"
+HUNSPELL_CFLAGS += -I$(SOLARVER)$/$(INPATH)$/inc$/hunspell
.ENDIF
-
-
-
#----- Settings ---------------------------------------------------------
.INCLUDE : settings.mk
# --- Files --------------------------------------------------------
-.IF "$(SYSTEM_HUNSPELL)" != "YES"
-CXXFLAGS += -I..$/hunspell -I..$/..$/lingutil
-CFLAGSCXX += -I..$/hunspell -I..$/..$/lingutil
-CFLAGSCC += -I..$/hunspell -I..$/..$/lingutil
-.ELSE
-CXXFLAGS += $(HUNSPELL_CFLAGS)
-CFLAGSCXX += $(HUNSPELL_CFLAGS)
-CFLAGSCC += $(HUNSPELL_CFLAGS)
-.ENDIF
+CXXFLAGS += -I$(PRJ)$/source$/lingutil $(HUNSPELL_CFLAGS)
+CFLAGSCXX += -I$(PRJ)$/source$/lingutil $(HUNSPELL_CFLAGS)
+CFLAGSCC += -I$(PRJ)$/source$/lingutil $(HUNSPELL_CFLAGS)
EXCEPTIONSFILES= \
$(SLO)$/sprophelp.obj\
@@ -95,13 +74,10 @@ SHL1STDLIBS= \
$(SALLIB) \
$(UCBHELPERLIB) \
$(UNOTOOLSLIB) \
- $(LNGLIB)
-
-.IF "$(SYSTEM_HUNSPELL)" != "YES"
-SHL1STDLIBS+= $(ULINGULIB) $(HUNSPELLLIB)
-.ELSE
-SHL1STDLIBS+= $(HUNSPELLLIB)
-.ENDIF
+ $(LNGLIB) \
+ $(ULINGULIB) \
+ $(ICUUCLIB) \
+ $(HUNSPELLLIB)
# build DLL
SHL1LIBS= $(SLB)$/$(TARGET).lib