User: hr Date: 05/04/11 01:41:52 Modified: /dba/connectivity/source/drivers/mozab/mozillasrc/ makefile.mk
Log: INTEGRATION: CWS macosx05 (1.15.6); FILE MERGED 2005/04/10 07:35:53 maho 1.15.6.1: enable mozilla connectivity stuff Issue number: 46546 Reviewed by: pjanik File Changes: Directory: /dba/connectivity/source/drivers/mozab/mozillasrc/ ============================================================= File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/mozillasrc/makefile.mk?r1=1.15&r2=1.16 Delta lines: +2 -3 ------------------- --- makefile.mk 30 Mar 2005 11:35:13 -0000 1.15 +++ makefile.mk 11 Apr 2005 08:41:49 -0000 1.16 @@ -84,8 +84,7 @@ .INCLUDE : settings.mk -.IF "$(OS)"=="MACOSX" || ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" - +.IF ("$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" dummy: @echo " Not building the mozillasrc stuff in OpenOffice.org build" @echo " dependency to Mozilla developer snapshots not feasable at the moment" @@ -163,7 +162,7 @@ -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \ -Wno-long-long -pthread CDEFS += -DTRACING -.ELIF "$(OS)" == "NETBSD" +.ELIF "$(OS)" == "NETBSD" || "$(OS)" == "MACOSX" CFLAGS += -fPIC CFLAGSCXX += \ -fno-rtti -Wall -Wconversion -Wpointer-arith \ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
