diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-13 13:44:17 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-13 13:44:17 +0000 |
| commit | 8b57ab778ff4f9b094c4b0569673803a8aa1a5c4 (patch) | |
| tree | a49778c81702ac72634fd0b33d370d1020780fd0 /lingucomponent | |
| parent | 224af7afa8b014962db8c1d393c6cdd8fe8cf6d0 (diff) | |
INTEGRATION: CWS hunspellexternal (1.7.22); FILE MERGED
2008/04/23 19:04:43 rene 1.7.22.4: #i87882# system dictionary paths
2008/04/22 14:16:23 cmc 1.7.22.3: rejig for dictmgr.hxx move
2008/04/22 06:40:38 rene 1.7.22.2: #i10000# readd
2007/10/04 10:44:54 rene 1.7.22.1: remove files which are supposed to used from the hunspell tarball
Diffstat (limited to 'lingucomponent')
| -rw-r--r-- | lingucomponent/source/lingutil/makefile.mk | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/lingucomponent/source/lingutil/makefile.mk b/lingucomponent/source/lingutil/makefile.mk index cc77e3267b5c..eb7eeb01b9db 100644 --- a/lingucomponent/source/lingutil/makefile.mk +++ b/lingucomponent/source/lingutil/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.10 $ # # This file is part of OpenOffice.org. # @@ -41,15 +41,21 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(SYSTEM_HUNSPELL)" == "YES" -@all: - @echo "Nothing to do here; using system hunspell..." +.IF "$(SYSTEM_HUNSPELL)" != "YES" +HUNSPELL_CFLAGS += -I$(SOLARVER)$/$(INPATH)$/inc$/hunspell .ENDIF -SLOFILES= \ - $(SLO)$/dictmgr.obj \ - $(SLO)$/lingutil.obj +.IF "$(SYSTEM_DICTS)" == "YES" +CXXFLAGS += -DSYSTEM_DICTS -DDICT_SYSTEM_DIR=\"$(DICT_SYSTEM_DIR)\" -DHYPH_SYSTEM_DIR=\"$(HYPH_SYSTEM_DIR)\" -DTHES_SYSTEM_DIR=\"$(THES_SYSTEM_DIR)\" +CFLAGSCXX += -DSYSTEM_DICTS -DDICT_SYSTEM_DIR=\"$(DICT_SYSTEM_DIR)\" -DHYPH_SYSTEM_DIR=\"$(HYPH_SYSTEM_DIR)\" -DTHES_SYSTEM_DIR=\"$(THES_SYSTEM_DIR)\" +CFLAGSCC += -DSYSTEM_DICTS -DDICT_SYSTEM_DIR=\"$(DICT_SYSTEM_DIR)\" -DHYPH_SYSTEM_DIR=\"$(HYPH_SYSTEM_DIR)\" -DTHES_SYSTEM_DIR=\"$(THES_SYSTEM_DIR)\" +.ENDIF + +CXXFLAGS += $(HUNSPELL_CFLAGS) +CFLAGSCXX += $(HUNSPELL_CFLAGS) +CFLAGSCC += $(HUNSPELL_CFLAGS) +SLOFILES=$(SLO)$/lingutil.obj LIB1TARGET= $(SLB)$/lib$(TARGET).lib LIB1ARCHIV= $(LB)/lib$(TARGET).a |