diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-13 13:09:21 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-13 13:09:21 +0000 |
| commit | 43fb4035d0b5e7ed323bb0356c210247f154599b (patch) | |
| tree | a094b815e0605cfb60bd3cbab89e7ee44a6790ef /lingucomponent | |
| parent | 7c919bf4070453299f59de15cb19c1ccf49b6f82 (diff) | |
INTEGRATION: CWS hunspellexternal (1.10.8); FILE MERGED
2008/04/22 14:16:24 cmc 1.10.8.5: rejig for dictmgr.hxx move
2008/04/22 06:39:45 rene 1.10.8.4: #i87604#, #i10000# fix the build with both internal and system hunspell
2008/04/21 09:30:15 rene 1.10.8.3: RESYNC: (1.11-1.14); FILE MERGED
2008/01/04 19:30:58 rene 1.10.8.2: RESYNC: (1.10-1.11); FILE MERGED
2007/10/08 11:09:34 rene 1.10.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/thesaurus/libnth/makefile.mk | 52 |
1 files changed, 14 insertions, 38 deletions
diff --git a/lingucomponent/source/thesaurus/libnth/makefile.mk b/lingucomponent/source/thesaurus/libnth/makefile.mk index 540f16bc18f6..9c0e68179ad0 100644 --- a/lingucomponent/source/thesaurus/libnth/makefile.mk +++ b/lingucomponent/source/thesaurus/libnth/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.14 $ +# $Revision: 1.15 $ # # This file is part of OpenOffice.org. # @@ -49,45 +49,24 @@ MYTHESLIB=libmythes.lib .ENDIF # wnt .ENDIF -.IF "$(ULINGULIB)"=="" -.IF "$(GUI)"=="UNX" -ULINGULIB=-lulingu -.ENDIF # unx -.IF "$(GUI)"=="OS2" -ULINGULIB=$(SLB)\libulingu.lib -.ENDIF # os2 -.IF "$(GUI)"=="WNT" -ULINGULIB=libulingu.lib -.ENDIF # wnt -.ENDIF - - #----- Settings --------------------------------------------------------- .INCLUDE : settings.mk # --- Files -------------------------------------------------------- -.IF "$(SYSTEM_HUNSPELL)" == "YES" && "$(SYSTEM_MYTHES)" == "YES" -CXXFLAGS += $(HUNSPELL_CFLAGS) -CFLAGSCXX += $(HUNSPELL_CFLAGS) -CFLAGSCC += $(HUNSPELL_CFLAGS) -.ENDIF -.IF "$(SYSTEM_HUNSPELL)" == "YES" && "$(SYSTEM_MYTHES)" != "YES" -CXXFLAGS += -I..$/mythes $(HUNSPELL_CFLAGS) -CFLAGSCXX += -I..$/mythes $(HUNSPELL_CFLAGS) -CFLAGSCC += -I..$/mythes $(HUNSPELL_CFLAGS) -.ENDIF -.IF "$(SYSTEM_HUNSPELL)" != "YES" && "$(SYSTEM_MYTHES)" == "YES" -CXXFLAGS += -I..$/..$/lingutil -CFLAGSCXX += -I..$/..$/lingutil -CFLAGSCC += -I..$/..$/lingutil +.IF "$(SYSTEM_HUNSPELL)" != "YES" +HUNSPELL_CFLAGS += -I$(SOLARVER)$/$(INPATH)$/inc$/hunspell .ENDIF -.IF "$(SYSTEM_HUNSPELL)" != "YES" && "$(SYSTEM_MYTHES)" != "YES" -CXXFLAGS += -I..$/mythes -I..$/..$/lingutil -CFLAGSCXX += -I..$/mythes -I..$/..$/lingutil -CFLAGSCC += -I..$/mythes -I..$/..$/lingutil + +.IF "$(SYSTEM_MYTHES)" != "YES" +CXXFLAGS += -I..$/mythes +CFLAGSCXX += -I..$/mythes +CFLAGSCC += -I..$/mythes .ENDIF +CXXFLAGS += -I$(PRJ)$/source$/lingutil $(HUNSPELL_CFLAGS) +CFLAGSCXX += -I$(PRJ)$/source$/lingutil $(HUNSPELL_CFLAGS) +CFLAGSCC += -I$(PRJ)$/source$/lingutil $(HUNSPELL_CFLAGS) EXCEPTIONSFILES= \ $(SLO)$/ntprophelp.obj\ @@ -115,13 +94,10 @@ SHL1STDLIBS= \ $(UCBHELPERLIB) \ $(UNOTOOLSLIB) \ $(LNGLIB) \ - $(MYTHESLIB) + $(ULINGULIB) \ + $(MYTHESLIB) \ + $(HUNSPELLLIB) -.IF "$(SYSTEM_HUNSPELL)" != "YES" -SHL1STDLIBS+= $(ULINGULIB) -.ELSE -SHL1STDLIBS+= $(HUNSPELL_LIBS) -.ENDIF # build DLL SHL1LIBS= $(SLB)$/$(TARGET).lib SHL1IMPLIB= i$(TARGET) |