merge with db33a

7 files changed, 166 insertions, 230 deletions

diff --git a/connectivity/qa/connectivity/tools/DbaseDatabase.java b/connectivity/qa/connectivity/tools/DbaseDatabase.java
index 9c1d6ea47411..8846c3995f56 100644
--- a/connectivity/qa/connectivity/tools/DbaseDatabase.java
+++ b/connectivity/qa/connectivity/tools/DbaseDatabase.java
@@ -65,7 +65,8 @@ public class DbaseDatabase extends AbstractDatabase
     private void createDBDocument() throws Exception
     {
         final File documentFile = File.createTempFile("dbase", ".odb");
-        documentFile.deleteOnExit();
+        if ( documentFile.exists() )
+            documentFile.delete();
         final File subPath = new File(documentFile.getParent() + File.separator + documentFile.getName().replaceAll(".odb", "") + File.separator );
         subPath.mkdir();
         //subPath.deleteOnExit();
diff --git a/connectivity/qa/connectivity/tools/HsqlDatabase.java b/connectivity/qa/connectivity/tools/HsqlDatabase.java
index d27816cf4b7e..593a5ad95981 100644
--- a/connectivity/qa/connectivity/tools/HsqlDatabase.java
+++ b/connectivity/qa/connectivity/tools/HsqlDatabase.java
@@ -71,7 +71,8 @@ public class HsqlDatabase extends AbstractDatabase
     private void createDBDocument() throws Exception
     {
         final File documentFile = File.createTempFile("testdb", ".odb");
-        documentFile.deleteOnExit();
+        if ( documentFile.exists() )
+            documentFile.delete();
         m_databaseDocumentFile = URLHelper.getFileURLFromSystemPath(documentFile);
 
         m_databaseDocument = (XOfficeDatabaseDocument) UnoRuntime.queryInterface(
diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
index b3cbb4ae67c7..4c3f3db8b754 100644
--- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
+++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
@@ -145,6 +145,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo(  ) throw(SQ
                 }
             }
 
+            ::connectivity::ODatabaseMetaDataResultSet::ORows aTypeInfoRows;
             while( xRet->next() )
             {
                 ::connectivity::ODatabaseMetaDataResultSet::ORow aRow;
@@ -169,8 +170,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo(  ) throw(SQ
                     else
                         ++aIter;
                 }
-                m_aTypeInfoRows.push_back(aRow);
+                aTypeInfoRows.push_back(aRow);
             }
+            m_aTypeInfoRows = aTypeInfoRows;
         }
     }
     ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTypeInfo);
diff --git a/connectivity/source/drivers/mozab/bootstrap/makefile.mk b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
index 9b4b05868cd2..00f76ddeb8fd 100644
--- a/connectivity/source/drivers/mozab/bootstrap/makefile.mk
+++ b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
@@ -30,37 +30,35 @@
 #*************************************************************************
 CALL_CDECL=TRUE
 
-#mozilla specific stuff.
-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
-#End of mozilla specific stuff.
-
 PRJ=..$/..$/..$/..
 PRJINC=..$/..$/..
 PRJNAME=connectivity
 TARGET=mozbootstrap
 
-USE_DEFFILE=TRUE
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
 .IF "$(OS)" == "OS2"
 all: 
     @echo "    Not building under OS/2"
 .ENDIF
 
 # --- Settings ----------------------------------
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
 
+USE_DEFFILE=TRUE
+ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
+
+# --- begin of mozilla specific stuff
+MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+# --- end of mozilla specific stuff
 
 .INCLUDE : settings.mk
 
 .INCLUDE :  $(PRJ)$/version.mk
 
+.INCLUDE : ../makefile_mozab.mk
+
+INCPRE += -I../mozillasrc
 
-#mozilla specific stuff.
 # --- Files -------------------------------------
 
 SLOFILES += \
@@ -93,95 +91,6 @@ SLOFILES += \
     $(SLO)$/MNSProfileDirServiceProvider.obj
 .ENDIF
 
-CDEFS     += -DMOZILLA_INTERNAL_API
-
-.IF "$(GUI)"=="UNX"
-.IF "$(COMNAME)"=="sunpro5"
-CFLAGS += -features=tmplife
-#This flag is needed to build mozilla 1.7 code
-.ENDIF		# "$(COMNAME)"=="sunpro5"
-.ENDIF
-
-MOZINC = . -I.. -I..$/mozillasrc -I$(MOZ_INC)  -I$(MOZ_INC)$/nspr -I$(MOZ_INC)$/xpcom \
-        -I$(MOZ_INC)$/string -I$(MOZ_INC)$/rdf -I$(MOZ_INC)$/msgbase \
-        -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
-        -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
-        -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
-        -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/uconv\
-        -I$(MOZ_INC)$/xpcom_obsolete -I$(MOZ_INC)$/content
-        
-.IF "$(GUI)" == "WNT"
-.IF "$(COM)" == "GCC"
-INCPOST += $(MOZINC)
-CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
-        -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-            -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-            -DNS_MT_SUPPORTED -DNETLIB_THREAD \
-            -DOJI -DWIN32 -D_X86_ -D_WINDOWS \
-        -DMOZ_XUL -DMOZ_REFLOW_PERF -DMOZ_REFLOW_PERF_DSP \
-        -DNSPR20 -DOS_HAS_DLL -DNO_JNI_STUBS \
-        -DNETSCAPE -DMOZILLA_CLIENT -DJS_THREADSAFE -DNECKO -DINCLUDE_XUL
-CFLAGSCXX += \
-            -fno-rtti -Wall -Wconversion -Wpointer-arith \
-            -Wcast-align -Woverloaded-virtual -Wsynth \
-            -Wno-long-long
-.ELSE
-.IF "$(DBG_LEVEL)" == "0"
-INCPRE += $(MOZINC)
-CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
-        -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-            -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-            -DDMSVC4 -DNS_MT_SUPPORTED -DNETLIB_THREAD \
-            -DOJI -DWIN32 -D_X86_ -D_WINDOWS \
-        -DMOZ_XUL -DMOZ_REFLOW_PERF -DMOZ_REFLOW_PERF_DSP \
-        -DNSPR20 -DOS_HAS_DLL -DNO_JNI_STUBS \
-        -DNETSCAPE -DMOZILLA_CLIENT -DJS_THREADSAFE -DNECKO -DINCLUDE_XUL	\
-        -UDEBUG
-CFLAGS +=   -GR- -W3 -Gy -MD -UDEBUG
-.ELSE
-INCPRE += $(MOZINC)
-CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
-        -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-            -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-            -DDMSVC4 -DDEVELOPER_DEBUG -DNS_MT_SUPPORTED -DNETLIB_THREAD \
-            -DOJI -DWIN32 -D_X86_ -D_WINDOWS \
-        -DMOZ_XUL -DMOZ_REFLOW_PERF -DMOZ_REFLOW_PERF_DSP \
-        -DDEBUG_Administrator -DNSPR20 -DOS_HAS_DLL -DNO_JNI_STUBS \
-        -DNETSCAPE -DMOZILLA_CLIENT -DJS_THREADSAFE -DNECKO -DINCLUDE_XUL	\
-        -UDEBUG
-CFLAGS +=   -Zi -GR- -W3 -Gy -MDd -UDEBUG
-.IF "$(CCNUMVER)" >= "001399999999"
-CDEFS  +=   -D_STL_NOFORCE_MANIFEST
-.ENDIF
-.ENDIF
-.ENDIF
-.ENDIF
-.IF "$(GUI)" == "UNX"
-INCPOST += $(MOZINC)
-CDEFS+=	    -DMOZILLA_CLIENT \
-            -DXP_UNIX
-.IF "$(OS)" == "LINUX"
-CFLAGS +=   -fPIC -g
-CDEFS+=     -DOJI
-
-CFLAGSCXX += \
-            -fno-rtti -Wconversion -Wpointer-arith \
-            -Wcast-align -Woverloaded-virtual -Wsynth \
-            -Wno-long-long -pthread
-CDEFS     += -DTRACING
-.ELIF "$(OS)" == "NETBSD" || "$(OS)" == "MACOSX"
-CFLAGS +=   -fPIC
-CFLAGSCXX += \
-            -fno-rtti -Wconversion -Wpointer-arith \
-            -Wcast-align -Woverloaded-virtual -Wsynth \
-            -Wno-long-long -Wno-deprecated
-CDEFS     += -DTRACING
-.ENDIF
-
-SHL1TARGET_NAME=$(TARGET)$(MOZAB_MAJOR)
-
-.ENDIF # MACOSX
-
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk
diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk
index 677e605096c4..76161dc32119 100644
--- a/connectivity/source/drivers/mozab/makefile.mk
+++ b/connectivity/source/drivers/mozab/makefile.mk
@@ -43,38 +43,28 @@ all:
     @echo "    see http://www.mozilla.org/issues/show_bug.cgi?id=91209"
 .ENDIF
 
-#mozilla specific stuff.
+# --- begin of mozilla specific stuff
 MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
 MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
 
 .IF "$(OS)"=="WNT" 
-.IF "$(USE_SHELL)"=="4nt"
-MOZ_EMBED_LIB := $(shell @+-dir /ba:f $(MOZ_LIB)$/embed_base_s.lib 2>NUL )
-MOZ_REG_LIB	  := $(shell @+-dir /ba:f $(MOZ_LIB)$/mozreg_s.lib 2>NUL )
-.ELSE	#"$(USE_SHELL)"=="4nt"
-MOZ_EMBED_LIB := $(shell @-test -f $(MOZ_LIB)$/embed_base_s.lib && echo $(MOZ_LIB)$/embed_base_s.lib )
-MOZ_REG_LIB	  := $(shell @-test -f $(MOZ_LIB)$/mozreg_s.lib && echo $(MOZ_LIB)$/mozreg_s.lib )
-.ENDIF
+  MOZ_EMBED_LIB := $(shell @-test -f $(MOZ_LIB)$/embed_base_s.lib && echo $(MOZ_LIB)$/embed_base_s.lib )
+  MOZ_REG_LIB	  := $(shell @-test -f $(MOZ_LIB)$/mozreg_s.lib && echo $(MOZ_LIB)$/mozreg_s.lib )
 
-.IF X"$(MOZ_EMBED_LIB)"=="X"
-MOZ_EMBED_LIB := $(MOZ_LIB)$/baseembed_s.lib
-.ENDIF
-.IF X"$(MOZ_REG_LIB)" == "X"
-MOZ_REG_LIB := $(MOZ_LIB)$/mozreg.lib
-.ENDIF
-.ENDIF
+  MOZ_EMBED_LIB *:= $(MOZ_LIB)$/baseembed_s.lib
+  MOZ_REG_LIB *:= $(MOZ_LIB)$/mozreg.lib
+
+  .IF "$(COM)"=="GCC"
+    MOZ_LIB_XPCOM= -L$(MOZ_LIB) -lembed_base_s -lnspr4 -lmozreg_s -lxpcom -lxpcom_core
+  .ELSE
+    LIB += $(MOZ_LIB)
+    MOZ_LIB_XPCOM= $(MOZ_EMBED_LIB) $(MOZ_LIB)$/nspr4.lib $(MOZ_REG_LIB) $(MOZ_LIB)$/xpcom.lib $(MOZ_LIB)$/xpcom_core.lib
+  .ENDIF
 
-.IF "$(OS)"=="WNT" 
-.IF "$(COM)"=="GCC"
-MOZ_LIB_XPCOM= -L$(MOZ_LIB) -lembed_base_s -lnspr4 -lmozreg_s -lxpcom -lxpcom_core
-.ELSE
-LIB += $(MOZ_LIB)
-MOZ_LIB_XPCOM= $(MOZ_EMBED_LIB) $(MOZ_LIB)$/nspr4.lib $(MOZ_REG_LIB) $(MOZ_LIB)$/xpcom.lib $(MOZ_LIB)$/xpcom_core.lib
-.ENDIF
 .ELSE "$(OS)"=="WNT" 
-MOZ_LIB_XPCOM= -L$(MOZ_LIB) -lnspr4 -lxpcom_core -lmozreg_s -lembed_base_s
+  MOZ_LIB_XPCOM = -L$(MOZ_LIB) -lnspr4 -lxpcom_core -lmozreg_s -lembed_base_s
 .ENDIF
-#End of mozilla specific stuff.
+# --- end of mozilla specific stuff
 
 USE_DEFFILE=TRUE
 ENABLE_EXCEPTIONS=TRUE
@@ -87,10 +77,6 @@ COMPONENT_CONFIG_SCHEMA=$(TARGET)2.xcs
 
 # --- Settings ----------------------------------
 
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
-
 .INCLUDE : $(PRJ)$/makefile.pmk
 
 .INCLUDE :  $(PRJ)$/version.mk
@@ -121,7 +107,6 @@ DEF1NAME=	$(SHL1TARGET)
 DEF1DEPN=	$(MISC)$/$(SHL1TARGET).flt \
             $(SLB)$/$(TARGET).lib
 DEFLIB1NAME=$(TARGET)
-#DEF1EXPORTFILE=	exports.dxp
 
 
 # --- Files -------------------------------------
@@ -165,6 +150,7 @@ DEPOBJFILES=$(SLO2FILES)
 # --- MOZAB BASE Library -----------------------------------
 
 SHL2VERSIONMAP= $(TARGET2).map
+SHL2NOCHECK=TRUE
 SHL2TARGET=	$(TARGET2)$(DLLPOSTFIX)
 SHL2OBJS=$(SLO2FILES)
 SHL2STDLIBS=\
diff --git a/connectivity/source/drivers/mozab/makefile_mozab.mk b/connectivity/source/drivers/mozab/makefile_mozab.mk
new file mode 100644
index 000000000000..28b56ec2a84a
--- /dev/null
+++ b/connectivity/source/drivers/mozab/makefile_mozab.mk
@@ -0,0 +1,128 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+CDEFS += -DMOZILLA_INTERNAL_API
+
+.IF "$(GUI)"=="UNX"
+  .IF "$(COMNAME)"=="sunpro5"
+    CFLAGS += -features=tmplife
+    #This flag is needed to build mozilla 1.7 code
+  .ENDIF		# "$(COMNAME)"=="sunpro5"
+.ENDIF
+
+MOZINC = . \
+        -I.. \
+        -I$(MOZ_INC) \
+        -I$(MOZ_INC)$/nspr \
+        -I$(MOZ_INC)$/xpcom \
+        -I$(MOZ_INC)$/string \
+        -I$(MOZ_INC)$/rdf \
+        -I$(MOZ_INC)$/msgbase \
+        -I$(MOZ_INC)$/addrbook \
+        -I$(MOZ_INC)$/mork \
+        -I$(MOZ_INC)$/locale \
+        -I$(MOZ_INC)$/pref \
+        -I$(MOZ_INC)$/mime \
+        -I$(MOZ_INC)$/chrome \
+        -I$(MOZ_INC)$/necko \
+        -I$(MOZ_INC)$/intl \
+        -I$(MOZ_INC)$/profile \
+        -I$(MOZ_INC)$/embed_base \
+        -I$(MOZ_INC)$/mozldap \
+        -I$(MOZ_INC)$/uconv \
+        -I$(MOZ_INC)$/xpcom_obsolete \
+        -I$(MOZ_INC)$/content
+        
+.IF "$(GUI)" == "WNT"
+  CDEFS +=    \
+        -DMOZILLA_CLIENT \
+        -DXP_PC \
+        -DXP_WIN \
+        -DXP_WIN32 \
+        -DOJI \
+        -DWIN32 \
+        -D_X86_ \
+        -D_WINDOWS \
+        -DMOZ_XUL \
+        -DMOZ_REFLOW_PERF \
+        -DMOZ_REFLOW_PERF_DSP
+  .IF "$(COM)" == "GCC"
+    INCPOST += $(MOZINC)
+    CFLAGSCXX += \
+                -fno-rtti \
+                -Wall \
+                -Wconversion \
+                -Wpointer-arith \
+                -Wcast-align \
+                -Woverloaded-virtual \
+                -Wsynth \
+                -Wno-long-long
+  .ELSE # .IF "$(COM)" == "GCC"
+    INCPRE += $(MOZINC)
+    .IF "$(DBG_LEVEL)" != "0"
+      .IF "$(CCNUMVER)" >= "001399999999"
+        CDEFS  +=   -D_STL_NOFORCE_MANIFEST
+      .ENDIF # .IF "$(CCNUMVER)" >= "001399999999"
+    .ENDIF # .IF "$(DBG_LEVEL)" != "0"
+  .ENDIF # .IF "$(COM)" == "GCC"
+.ENDIF # .IF "$(GUI)" == "WNT"
+
+.IF "$(GUI)" == "UNX"
+  INCPOST += $(MOZINC)
+  CDEFS+=   -DMOZILLA_CLIENT \
+            -DXP_UNIX
+  .IF "$(OS)" == "LINUX"
+    CFLAGS  += -fPIC -g
+    CDEFS   += -DOJI
+    CFLAGSCXX += \
+            -fno-rtti \
+            -Wconversion \
+            -Wpointer-arith \
+            -Wcast-align \
+            -Woverloaded-virtual \
+            -Wsynth \
+            -Wno-long-long \
+            -pthread
+    CDEFS     += -DTRACING
+  .ELIF "$(OS)" == "NETBSD" || "$(OS)" == "MACOSX"
+    CFLAGS +=   -fPIC
+    CFLAGSCXX += \
+            -fno-rtti \
+            -Wconversion \
+            -Wpointer-arith \
+            -Wcast-align \
+            -Woverloaded-virtual \
+            -Wsynth \
+            -Wno-long-long \
+            -Wno-deprecated
+    CDEFS += -DTRACING
+  .ENDIF # "$(OS)" == "NETBSD" || "$(OS)" == "MACOSX"
+
+  SHL1TARGET_NAME=$(TARGET)$(MOZAB_MAJOR)
+
+.ENDIF # "$(GUI)" == "UNX"
+
diff --git a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
index e31d4c7e412b..1e5b39e0f140 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
+++ b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
@@ -40,16 +40,12 @@ PRJINC=..$/..$/..
 PRJNAME=connectivity
 TARGET=mozabsrc
 
+# --- Settings ----------------------------------
+
 USE_DEFFILE=TRUE
 ENABLE_EXCEPTIONS=TRUE
 VISIBILITY_HIDDEN=TRUE
 
-# --- Settings ----------------------------------
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
-
-
 .INCLUDE : settings.mk
 
 .IF  ("$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" || "$(OS)" == "OS2"
@@ -61,8 +57,10 @@ dummy:
 
 .INCLUDE :  $(PRJ)$/version.mk
 
+.INCLUDE : ../makefile_mozab.mk
+
+INCPRE += -I../bootstrap
 
-#mozilla specific stuff.
 # --- Files -------------------------------------
 
 SLOFILES = \
@@ -74,98 +72,9 @@ SLOFILES = \
     $(SLO)$/MNSMozabProxy.obj	            \
     $(SLO)$/MNSTerminateListener.obj        \
     $(SLO)$/MLdapAttributeMap.obj           \
-    
-
-CDEFS     += -DMOZILLA_INTERNAL_API
 
-.IF "$(GUI)"=="UNX"
-.IF "$(COMNAME)"=="sunpro5"
-CFLAGS += -features=tmplife
-#This flag is needed to build mozilla 1.7 code
-.ENDIF		# "$(COMNAME)"=="sunpro5"
 .ENDIF
 
-MOZINC = . -I.. -I..$/bootstrap -I$(MOZ_INC)  -I$(MOZ_INC)$/nspr -I$(MOZ_INC)$/xpcom \
-        -I$(MOZ_INC)$/string -I$(MOZ_INC)$/rdf -I$(MOZ_INC)$/msgbase \
-        -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
-        -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
-        -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
-        -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/uconv\
-        -I$(MOZ_INC)$/xpcom_obsolete -I$(MOZ_INC)$/content
-        
-.IF "$(GUI)" == "WNT"
-.IF "$(COM)"=="GCC"
-INCPOST += $(MOZINC)
-CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
-        -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-            -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-            -DNS_MT_SUPPORTED -DNETLIB_THREAD \
-            -DOJI -DWIN32 -D_X86_ -D_WINDOWS \
-        -DMOZ_XUL -DMOZ_REFLOW_PERF -DMOZ_REFLOW_PERF_DSP \
-        -DNSPR20 -DOS_HAS_DLL -DNO_JNI_STUBS \
-        -DNETSCAPE -DMOZILLA_CLIENT -DJS_THREADSAFE -DNECKO -DINCLUDE_XUL
-CFLAGSCXX += \
-            -fno-rtti -Wall -Wconversion -Wpointer-arith \
-            -Wcast-align -Woverloaded-virtual -Wsynth \
-            -Wno-long-long
-.ELSE
-.IF "$(DBG_LEVEL)" == "0"
-INCPRE += $(MOZINC)
-CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
-        -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-            -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-            -DDMSVC4 -DNS_MT_SUPPORTED -DNETLIB_THREAD \
-            -DOJI -DWIN32 -D_X86_ -D_WINDOWS \
-        -DMOZ_XUL -DMOZ_REFLOW_PERF -DMOZ_REFLOW_PERF_DSP \
-        -DNSPR20 -DOS_HAS_DLL -DNO_JNI_STUBS \
-        -DNETSCAPE -DMOZILLA_CLIENT -DJS_THREADSAFE -DNECKO -DINCLUDE_XUL	\
-        -UDEBUG
-CFLAGS +=   -GR- -W3 -Gy -MD -UDEBUG
-.ELSE
-INCPRE += $(MOZINC)
-CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
-        -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-            -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-            -DDMSVC4 -DDEVELOPER_DEBUG -DNS_MT_SUPPORTED -DNETLIB_THREAD \
-            -DOJI -DWIN32 -D_X86_ -D_WINDOWS \
-        -DMOZ_XUL -DMOZ_REFLOW_PERF -DMOZ_REFLOW_PERF_DSP \
-        -DDEBUG_Administrator -DNSPR20 -DOS_HAS_DLL -DNO_JNI_STUBS \
-        -DNETSCAPE -DMOZILLA_CLIENT -DJS_THREADSAFE -DNECKO -DINCLUDE_XUL	\
-        -UDEBUG
-CFLAGS +=   -Zi -GR- -W3 -Gy -MDd -UDEBUG
-.IF "$(CCNUMVER)" >= "001399999999"
-CDEFS  +=   -D_STL_NOFORCE_MANIFEST
-.ENDIF
-.ENDIF
-.ENDIF
-.ENDIF
-.IF "$(GUI)" == "UNX"
-INCPOST += $(MOZINC)
-CDEFS+=	    -DMOZILLA_CLIENT \
-            -DXP_UNIX
-.IF "$(OS)" == "LINUX"
-CFLAGS +=   -fPIC -g
-CDEFS+=     -DOJI
-
-CFLAGSCXX += \
-            -fno-rtti -Wconversion -Wpointer-arith \
-            -Wcast-align -Woverloaded-virtual -Wsynth \
-            -Wno-long-long -pthread
-CDEFS     += -DTRACING
-.ELIF "$(OS)" == "NETBSD" || "$(OS)" == "MACOSX"
-CFLAGS +=   -fPIC
-CFLAGSCXX += \
-            -fno-rtti -Wconversion -Wpointer-arith \
-            -Wcast-align -Woverloaded-virtual -Wsynth \
-            -Wno-long-long -Wno-deprecated
-CDEFS     += -DTRACING
-.ENDIF
-.ENDIF
-
-SHL1TARGET_NAME=$(TARGET)$(MOZAB_MAJOR)
-
-.ENDIF # MACOSX
-
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk