diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2009-02-17 08:08:51 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2009-02-17 08:08:51 +0000 |
| commit | 22c3f9f04d4be83366cef0c4a5072d5d72cc666d (patch) | |
| tree | 79f27cb2e760a80b9a5e2683b54af0600cefbc2b | |
| parent | 687bd7121e0276749864b34563dc93220d9906a7 (diff) | |
CWS-TOOLING: integrate CWS macmozxmlsec31_OOO310
2009-01-06 16:20:16 +0100 fs r265929 : #i97798#
2009-01-06 16:19:57 +0100 fs r265928 : #i97798#
2009-01-05 15:07:06 +0100 fs r265872 : creating CWS macmozxmlsec, based on CWS mozbootstrapfix
| -rw-r--r-- | connectivity/source/drivers/mozab/bootstrap/makefile.mk | 2 | ||||
| -rw-r--r-- | connectivity/source/drivers/mozab/makefile.mk | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/connectivity/source/drivers/mozab/bootstrap/makefile.mk b/connectivity/source/drivers/mozab/bootstrap/makefile.mk index 52ab465798..5e4927f811 100644 --- a/connectivity/source/drivers/mozab/bootstrap/makefile.mk +++ b/connectivity/source/drivers/mozab/bootstrap/makefile.mk @@ -64,7 +64,7 @@ SLOFILES += \ $(SLO)$/MMozillaBootstrap.obj \ $(SLO)$/MNSFolders.obj -.IF ("$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" +.IF ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES" ) || ( "$(WITH_MOZILLA)" == "NO" ) || ( "$(OS)" == "MACOSX" ) CDEFS+=-DMINIMAL_PROFILEDISCOVER SHL1TARGET=$(TARGET) diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk index 6d7ce287c2..c2f0f2220d 100644 --- a/connectivity/source/drivers/mozab/makefile.mk +++ b/connectivity/source/drivers/mozab/makefile.mk @@ -34,11 +34,12 @@ PRJNAME=connectivity TARGET=mozab TARGET2=$(TARGET)drv -.IF ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" +.IF ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" || ( "$(OS)" == "MACOSX" ) all: - @echo " Not building the mozabsrc stuff in OpenOffice.org build" - @echo " dependency to Mozilla developer snapshots not feasable at the moment" - @echo " see http://bugzilla.mozilla.org/show_bug.cgi?id=135137" + @echo " Not building the mozilla address book driver" + @echo " dependency to Mozilla developer snapshots not feasable at the moment" + @echo " see http://bugzilla.mozilla.org/show_bug.cgi?id=135137" + @echo " see http://www.mozilla.org/issues/show_bug.cgi?id=91209" .ENDIF #mozilla specific stuff. |