diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-06-17 08:22:29 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-06-17 08:22:29 +0000 |
| commit | 32c6759d9b3aef58b177f9e9430d02625cd0a88b (patch) | |
| tree | dc87e84094967e2704afc22747150fb51d7c1051 /lingucomponent | |
| parent | 6c4a654e3c2d3892aa8e81328f7f74495ae5e5a7 (diff) | |
INTEGRATION: CWS moresystemstuff2 (1.7.14); FILE MERGED
2005/04/01 10:21:37 rene 1.7.14.1: #i46467# add more system stuff and options to link against pam/crypt/xrender
Diffstat (limited to 'lingucomponent')
| -rw-r--r-- | lingucomponent/source/spellcheck/spell/makefile.mk | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/lingucomponent/source/spellcheck/spell/makefile.mk b/lingucomponent/source/spellcheck/spell/makefile.mk index 301d082e6c90..02547a63b265 100644 --- a/lingucomponent/source/spellcheck/spell/makefile.mk +++ b/lingucomponent/source/spellcheck/spell/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: hr $ $Date: 2004-03-09 12:42:40 $ +# last change: $Author: obo $ $Date: 2005-06-17 09:22:29 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -69,7 +69,7 @@ USE_DEFFILE=TRUE .IF "$(MYSPELLLIB)"=="" .IF "$(GUI)"=="UNX" -MYSPELLLIB=-lmyspell +MYSPELLLIB=$(MYSPELL_LIBS) .ENDIF # unx .IF "$(GUI)"=="WNT" MYSPELLLIB=myspell.lib @@ -125,9 +125,15 @@ UNOTYPES=\ com.sun.star.linguistic2.XThesaurus -CXXFLAGS += -I..$/myspell -I..$/..$/lingutil +.IF "$(SYSTEM_MYSPELL)" != "YES" +CXXFLAGS += -I..$/myspell -I..$/..$/lingutil CFLAGSCXX += -I..$/myspell -I..$/..$/lingutil -CFLAGSCC += -I..$/myspell -I..$/..$/lingutil +CFLAGSCC += -I..$/myspell -I..$/..$/lingutil +.ELSE +CXXGLAGS += $(MYSPELL_CFLAGS) +CFLAGSCXX += $(MYSPELL_CFLAGS) +CFLAGSCC += $(MYSPELL_CFLAGS) +.ENDIF .IF "$(header)" == "" @@ -157,9 +163,11 @@ SHL1STDLIBS= \ $(UCBHELPERLIB) \ $(UNOTOOLSLIB) \ $(LNGLIB) \ - $(MYSPELLLIB) \ - $(ULINGULIB) + $(MYSPELLLIB) +.IF "$(SYSTEM_MYSPELL)" != "YES" +SHL1STDLIBS+= $(ULINGULIB) +.ENDIF # build DLL SHL1LIBS= $(SLB)$/$(TARGET).lib |