diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-05-06 09:08:38 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-05-06 09:08:38 +0000 |
| commit | 3d3a6a49532e893a620b66faeaed2aa420ae0038 (patch) | |
| tree | 7f959c0ebcf0f1dbe68ed491bc2db11bd1e12afb /lingucomponent | |
| parent | 82b0572170e95d450aa7718254bf4e07c50f4513 (diff) | |
INTEGRATION: CWS hyphenexternal (1.15.18); FILE MERGED
2008/04/22 13:56:13 rene 1.15.18.3: RESYNC: (1.16-1.19); FILE MERGED
2008/02/18 09:43:31 rene 1.15.18.2: use hyphen.lib
2007/12/03 00:07:53 rene 1.15.18.1: no interna libhnj anymore, use hyphen 2.3
Diffstat (limited to 'lingucomponent')
| -rw-r--r-- | lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk index fa7620d38085..8981402876ea 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.19 $ +# $Revision: 1.20 $ # # This file is part of OpenOffice.org. # @@ -37,15 +37,11 @@ ENABLE_EXCEPTIONS=TRUE USE_DEFFILE=TRUE .IF "$(GUI)"=="UNX" -.IF "$(SYSTEM_HYPH)" == "YES" -HNJLIB=$(HYPHEN_LIB) -.ELSE -HNJLIB=-lhnj -.ENDIF +HNJLIB=-lhyphen .ELIF "$(GUI)"=="OS2" -HNJLIB=$(SLB)\libhnj.lib +HNJLIB=$(SLB)\hyphen.lib .ELSE -HNJLIB=libhnj.lib +HNJLIB=hyphen.lib .ENDIF .IF "$(ULINGULIB)"=="" @@ -69,9 +65,9 @@ ULINGULIB=libulingu.lib # --- Files -------------------------------------------------------- -CXXFLAGS += -I..$/libhnj -I..$/..$/..$/lingutil -CFLAGSCXX += -I..$/libhnj -I..$/..$/..$/lingutil -CFLAGSCC += -I..$/libhnj -I..$/..$/..$/lingutil +CXXFLAGS += -I..$/..$/..$/lingutil +CFLAGSCXX += -I..$/..$/..$/lingutil +CFLAGSCC += -I..$/..$/..$/lingutil .IF "$(header)" == "" |