diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-13 13:36:45 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-13 13:36:45 +0000 |
| commit | 224af7afa8b014962db8c1d393c6cdd8fe8cf6d0 (patch) | |
| tree | 756d8018629bf67abb598eb00b111e91e4f47b53 /lingucomponent | |
| parent | f4154cd60fc8b3eef7fa2687c6e2b90308a99856 (diff) | |
INTEGRATION: CWS hunspellexternal (1.14.8); FILE MERGED
2008/04/22 14:16:23 cmc 1.14.8.5: rejig for dictmgr.hxx move
2008/04/22 06:39:44 rene 1.14.8.4: #i87604#, #i10000# fix the build with both internal and system hunspell
2008/04/21 09:30:24 rene 1.14.8.3: RESYNC: (1.16-1.19); FILE MERGED
2008/01/04 19:30:54 rene 1.14.8.2: RESYNC: (1.14-1.16); FILE MERGED
2007/10/08 11:09:33 rene 1.14.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/hyphenator/altlinuxhyph/hyphen/makefile.mk | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk index 703580bad7fa..e65d637f8a2f 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.22 $ +# $Revision: 1.23 $ # # This file is part of OpenOffice.org. # @@ -44,26 +44,17 @@ HNJLIB=$(SLB)\hyphen.lib HNJLIB=hyphen.lib .ENDIF -.IF "$(ULINGULIB)"=="" -.IF "$(GUI)"=="UNX" -ULINGULIB=-lulingu -.ENDIF # unx -.IF "$(GUI)"=="OS2" -ULINGULIB=$(SLB)\libulingu.lib -.ENDIF # unx -.IF "$(GUI)"=="WNT" -ULINGULIB=libulingu.lib -.ENDIF # wnt -.ENDIF - #----- Settings --------------------------------------------------------- .INCLUDE : settings.mk # --- Files -------------------------------------------------------- +.IF "$(SYSTEM_HUNSPELL)" != "YES" +HUNSPELL_CFLAGS += -I$(SOLARVER)$/$(INPATH)$/inc$/hunspell +.ENDIF -CFLAGS += -I..$/..$/..$/lingutil +CFLAGS += -I..$/..$/..$/lingutil $(HUNSPELL_CFLAGS) EXCEPTIONSFILES= \ $(SLO)$/hprophelp.obj\ @@ -90,13 +81,9 @@ SHL1STDLIBS= \ $(UCBHELPERLIB) \ $(UNOTOOLSLIB) \ $(LNGLIB) \ - $(HNJLIB) - -.IF "$(SYSTEM_HUNSPELL)" != "YES" -SHL1STDLIBS+= $(ULINGULIB) -.ELSE -SHL1STDLIBS+= $(HUNSPELL_LIBS) -.ENDIF + $(HNJLIB) \ + $(ULINGULIB) \ + $(HUNSPELLLIB) # build DLL SHL1LIBS= $(SLB)$/$(TARGET).lib |