Index: source/drivers/mozab/makefile.mk =================================================================== RCS file: /cvs/dba/connectivity/source/drivers/mozab/makefile.mk,v retrieving revision 1.6.2.2.2.1 diff -u -r1.6.2.2.2.1 makefile.mk --- source/drivers/mozab/makefile.mk 8 Aug 2002 06:14:14 -0000 1.6.2.2.2.1 +++ source/drivers/mozab/makefile.mk 30 Sep 2002 04:48:56 -0000 @@ -66,13 +66,6 @@ TARGET=$(MOZAB_TARGET) TARGET2=$(MOZAB_TARGET)drv -.IF "$(OS)"=="MACOSX" -all: - @echo " Not building the mozabsrc stuff in OpenOffice.org build" - @echo " dependency to Mozilla developer snapshots not feasable at the moment" - -.ENDIF - #mozilla specific stuff. MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT) MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla @@ -164,6 +157,10 @@ $(SLO)$/MDatabaseMetaData.obj \ $(SLO)$/MConnection.obj \ $(MOZSLOFILES) + +.IF "$(OS)"=="MACOSX" +SLO2FILES+=$(SLO)/MDriver.obj +.ENDIF # --- MOZAB BASE Library ----------------------------------- Index: source/drivers/mozab/mozillasrc/makefile.mk =================================================================== RCS file: /cvs/dba/connectivity/source/drivers/mozab/mozillasrc/makefile.mk,v retrieving revision 1.7.2.2.2.1 diff -u -r1.7.2.2.2.1 makefile.mk --- source/drivers/mozab/mozillasrc/makefile.mk 8 Aug 2002 06:14:23 -0000 1.7.2.2.2.1 +++ source/drivers/mozab/mozillasrc/makefile.mk 30 Sep 2002 04:48:56 -0000 @@ -85,14 +85,6 @@ .INCLUDE : settings.mk -.IF "$(OS)"=="MACOSX" - -dummy: - @echo " Not building the mozillasrc stuff in OpenOffice.org build" - @echo " dependency to Mozilla developer snapshots not feasable at the moment" - -.ELSE - .INCLUDE : $(PRJ)$/version.mk @@ -167,12 +159,17 @@ -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \ -Wno-long-long CDEFS += -DTRACING +.ELIF "$(OS)" == "MACOSX" +CFLAGS += -fPIC +CFLAGSCXX += \ + -fno-rtti -Wall -Wconversion -Wpointer-arith \ + -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \ + -Wno-long-long +CDEFS += -DTRACING .ENDIF .ENDIF SHL1TARGET_NAME=$(TARGET)$(MOZAB_MAJOR) - -.ENDIF # MACOSX # --- Targets ---------------------------------- Index: source/drivers/mozaddressbook/makefile.mk =================================================================== RCS file: /cvs/dba/connectivity/source/drivers/mozaddressbook/Attic/makefile.mk,v retrieving revision 1.11.10.1.2.1 diff -u -r1.11.10.1.2.1 makefile.mk --- source/drivers/mozaddressbook/makefile.mk 8 Aug 2002 06:14:33 -0000 1.11.10.1.2.1 +++ source/drivers/mozaddressbook/makefile.mk 30 Sep 2002 04:48:56 -0000 @@ -65,12 +65,6 @@ PRJNAME=connectivity TARGET=mozab -.IF "$(OS)"=="MACOSX" -all: - @echo " Not building the addressbook driver in OpenOffice.org build on OS X" - @echo " dependency to Mozilla developer snapshots not feasable at the moment" -.ENDIF - .IF "$(BUILD_SOSL)"!="" all: @echo " Not building the addressbook driver in OpenOffice.org build"