diff options
| author | Kurt Zenker <kz@openoffice.org> | 2009-09-10 22:44:47 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2009-09-10 22:44:47 +0000 |
| commit | f0ed8716b3b2556cb86e8005be88922c594c1189 (patch) | |
| tree | 487bfcce6d8b684a059d8b15078d4c2b62ae203a /connectivity | |
| parent | 270e03fea6602d0b4d4b0e63c9711fed00d6646b (diff) | |
CWS-TOOLING: integrate CWS os2port06dev300
2009-09-05 22:49:00 +0200 ydario r275858 : #i99588# applied os2port06 diff to DEV300 tree.
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/mozab/bootstrap/makefile.mk | 5 | ||||
| -rw-r--r-- | connectivity/source/drivers/mozab/makefile.mk | 2 | ||||
| -rw-r--r-- | connectivity/source/drivers/mozab/mozillasrc/makefile.mk | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/connectivity/source/drivers/mozab/bootstrap/makefile.mk b/connectivity/source/drivers/mozab/bootstrap/makefile.mk index a22b3699760a..9b4b05868cd2 100644 --- a/connectivity/source/drivers/mozab/bootstrap/makefile.mk +++ b/connectivity/source/drivers/mozab/bootstrap/makefile.mk @@ -44,6 +44,11 @@ USE_DEFFILE=TRUE ENABLE_EXCEPTIONS=TRUE VISIBILITY_HIDDEN=TRUE +.IF "$(OS)" == "OS2" +all: + @echo " Not building under OS/2" +.ENDIF + # --- Settings ---------------------------------- .IF "$(DBGUTIL_OJ)"!="" ENVCFLAGS+=/FR$(SLO)$/ diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk index 42ce1ab8ca6e..677e605096c4 100644 --- a/connectivity/source/drivers/mozab/makefile.mk +++ b/connectivity/source/drivers/mozab/makefile.mk @@ -35,7 +35,7 @@ TARGET=mozab TARGET2=$(TARGET)drv VISIBILITY_HIDDEN=TRUE -.IF ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" || ( "$(OS)" == "MACOSX" ) +.IF ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" || ( "$(OS)" == "MACOSX" ) || ( "$(OS)" == "OS2" ) all: @echo " Not building the mozilla address book driver" @echo " dependency to Mozilla developer snapshots not feasable at the moment" diff --git a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk index e350365d3442..e31d4c7e412b 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk +++ b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk @@ -52,7 +52,7 @@ ENVCFLAGS+=/FR$(SLO)$/ .INCLUDE : settings.mk -.IF ("$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" +.IF ("$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" || "$(OS)" == "OS2" dummy: @echo " Not building the mozillasrc stuff in OpenOffice.org build" @echo " dependency to Mozilla developer snapshots not feasable at the moment" |