Attachment #3020 for issue #7811

View | Details | Raw Unified | Return to issue 7811
Collapse All | Expand All




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

		$(SLO)$/MDatabaseMetaData.obj			\
		$(SLO)$/MConnection.obj					\
		$(MOZSLOFILES)

.IF "$(OS)"=="MACOSX"
SLO2FILES+=$(SLO)/MDriver.obj
.ENDIF

# --- MOZAB BASE Library -----------------------------------






.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



            -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 ----------------------------------





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"

Return to issue 7811

Lines 66-78 Link Here

(-)source/drivers/mozab/makefile.mk (-7 / +4 lines)
66	TARGET=$(MOZAB_TARGET)	66	TARGET=$(MOZAB_TARGET)
67	TARGET2=$(MOZAB_TARGET)drv	67	TARGET2=$(MOZAB_TARGET)drv
68		68
69	.IF "$(OS)"=="MACOSX"
70	all:
71	@echo " Not building the mozabsrc stuff in OpenOffice.org build"
72	@echo " dependency to Mozilla developer snapshots not feasable at the moment"
73
74	.ENDIF
75
76	#mozilla specific stuff.	69	#mozilla specific stuff.
77	MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)	70	MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
78	MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla	71	MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
Lines 164-169 Link Here
164	$(SLO)$/MDatabaseMetaData.obj \	157	$(SLO)$/MDatabaseMetaData.obj \
165	$(SLO)$/MConnection.obj \	158	$(SLO)$/MConnection.obj \
166	$(MOZSLOFILES)	159	$(MOZSLOFILES)
		160
		161	.IF "$(OS)"=="MACOSX"
		162	SLO2FILES+=$(SLO)/MDriver.obj
		163	.ENDIF
167		164
168	# --- MOZAB BASE Library -----------------------------------	165	# --- MOZAB BASE Library -----------------------------------
169		166

Lines 85-98 Link Here

(-)source/drivers/mozab/mozillasrc/makefile.mk (-10 / +7 lines)
85		85
86	.INCLUDE : settings.mk	86	.INCLUDE : settings.mk
87		87
88	.IF "$(OS)"=="MACOSX"
89
90	dummy:
91	@echo " Not building the mozillasrc stuff in OpenOffice.org build"
92	@echo " dependency to Mozilla developer snapshots not feasable at the moment"
93
94	.ELSE
95
96	.INCLUDE : $(PRJ)$/version.mk	88	.INCLUDE : $(PRJ)$/version.mk
97		89
98		90
Lines 167-178 Link Here
167	-Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \	159	-Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
168	-Wno-long-long	160	-Wno-long-long
169	CDEFS += -DTRACING	161	CDEFS += -DTRACING
		162	.ELIF "$(OS)" == "MACOSX"
		163	CFLAGS += -fPIC
		164	CFLAGSCXX += \
		165	-fno-rtti -Wall -Wconversion -Wpointer-arith \
		166	-Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
		167	-Wno-long-long
		168	CDEFS += -DTRACING
170	.ENDIF	169	.ENDIF
171	.ENDIF	170	.ENDIF
172		171
173	SHL1TARGET_NAME=$(TARGET)$(MOZAB_MAJOR)	172	SHL1TARGET_NAME=$(TARGET)$(MOZAB_MAJOR)
174
175	.ENDIF # MACOSX
176		173
177	# --- Targets ----------------------------------	174	# --- Targets ----------------------------------
178		175

Lines 65-76 Link Here

(-)source/drivers/mozaddressbook/makefile.mk (-6 lines)
65	PRJNAME=connectivity	65	PRJNAME=connectivity
66	TARGET=mozab	66	TARGET=mozab
67		67
68	.IF "$(OS)"=="MACOSX"
69	all:
70	@echo " Not building the addressbook driver in OpenOffice.org build on OS X"
71	@echo " dependency to Mozilla developer snapshots not feasable at the moment"
72	.ENDIF
73
74	.IF "$(BUILD_SOSL)"!=""	68	.IF "$(BUILD_SOSL)"!=""
75	all:	69	all:
76	@echo " Not building the addressbook driver in OpenOffice.org build"	70	@echo " Not building the addressbook driver in OpenOffice.org build"