Tag: cws_src680_macosx05
User: maho    
Date: 05/04/10 00:35:56

Modified:
 /dba/connectivity/source/drivers/mozab/
  makefile.mk
 /dba/connectivity/source/drivers/mozab/bootstrap/
  makefile.mk
 /dba/connectivity/source/drivers/mozab/mozillasrc/
  makefile.mk

Log:
 enable mozilla connectivity stuff
 Issue number:  46546
 Reviewed by:   pjanik

File Changes:

Directory: /dba/connectivity/source/drivers/mozab/
==================================================

File [changed]: makefile.mk
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/makefile.mk?r1=1.18&r2=1.18.6.1
Delta lines:  +3 -3
-------------------
--- makefile.mk 1 Apr 2005 16:25:30 -0000       1.18
+++ makefile.mk 10 Apr 2005 07:35:52 -0000      1.18.6.1
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.18 $
+#   $Revision: 1.18.6.1 $
 #
-#   last change: $Author: rt $ $Date: 2005/04/01 16:25:30 $
+#   last change: $Author: maho $ $Date: 2005/04/10 07:35:52 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -65,7 +65,7 @@
 TARGET=$(MOZAB_TARGET)
 TARGET2=$(MOZAB_TARGET)drv
 
-.IF  "$(OS)"=="MACOSX" || ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" 
== "YES") || "$(WITH_MOZILLA)" == "NO"
+.IF ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || 
"$(WITH_MOZILLA)" == "NO"
 all: 
        @echo "         Not building the mozabsrc stuff in OpenOffice.org build"
        @echo "         dependency to Mozilla developer snapshots not feasable 
at the moment"

Directory: /dba/connectivity/source/drivers/mozab/bootstrap/
============================================================

File [changed]: makefile.mk
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/makefile.mk?r1=1.3&r2=1.3.6.1
Delta lines:  +5 -6
-------------------
--- makefile.mk 30 Mar 2005 11:34:59 -0000      1.3
+++ makefile.mk 10 Apr 2005 07:35:53 -0000      1.3.6.1
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.3.6.1 $
 #
-#   last change: $Author: rt $ $Date: 2005/03/30 11:34:59 $
+#   last change: $Author: maho $ $Date: 2005/04/10 07:35:53 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -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"
@@ -165,7 +164,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 \

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.15.6.1
Delta lines:  +5 -6
-------------------
--- makefile.mk 30 Mar 2005 11:35:13 -0000      1.15
+++ makefile.mk 10 Apr 2005 07:35:53 -0000      1.15.6.1
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.15 $
+#   $Revision: 1.15.6.1 $
 #
-#   last change: $Author: rt $ $Date: 2005/03/30 11:35:13 $
+#   last change: $Author: maho $ $Date: 2005/04/10 07:35:53 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -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]

Reply via email to