Index: solenv/inc/libs.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/libs.mk,v
retrieving revision 1.116
retrieving revision 1.98.36.8
diff -u -b -I $Revision.*$ -I $Author.*$ -r1.116 -r1.98.36.8
--- solenv/inc/libs.mk	18 Jul 2007 08:01:00 -0000	1.116
+++ solenv/inc/libs.mk	24 Jul 2007 20:46:56 -0000	1.98.36.8
@@ -177,6 +177,7 @@
 TKTLIB=-ltkt$(OFFICEUPD)$(DLLPOSTFIX)
 SJLIB=-lj$(OFFICEUPD)$(DLLPOSTFIX)_g
 GOODIESLIB=-lgo$(OFFICEUPD)$(DLLPOSTFIX)
+SAXLIB=-lsax$(OFFICEUPD)$(DLLPOSTFIX)
 MAILLIB=-lmail
 DOCMGRLIB=-ldmg$(OFFICEUPD)$(DLLPOSTFIX)
 BASICLIB=-lsb$(OFFICEUPD)$(DLLPOSTFIX)
@@ -395,6 +396,7 @@
 SVLLIB=isvl.lib
 PLUGAPPLIB=plugapp.lib
 GOODIESLIB=igo.lib
+SAXLIB=isax.lib
 MAILLIB=mail.lib
 DOCMGRLIB=docmgr.lib
 BASICLIB=basic.lib
Index: solenv/inc/rules.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/rules.mk,v
retrieving revision 1.89
retrieving revision 1.65.54.8
diff -u -b -I $Revision.*$ -I $Author.*$ -r1.89 -r1.65.54.8
--- solenv/inc/rules.mk	5 Jul 2007 09:04:04 -0000	1.89
+++ solenv/inc/rules.mk	24 Jul 2007 20:48:50 -0000	1.65.54.8
@@ -79,6 +79,27 @@
 .ENDIF
 .ENDIF
 
+$(OBJ)$/%.obj : %.cc
+	@echo ------------------------------
+	@echo Making: $@
+.IF "$(GUI)"=="UNX"
+	@$(RM) $@ $(@:s/.obj/.o/)
+	$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cc
+.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
+    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
+.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
+	+$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
+.ELSE
+	@+-$(RM) $@ >& $(NULLDEV)
+	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cc )
+	@+$(ECHONL)
+.IF "$(COM)"=="GCC"
+	$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cc 
+.ELSE
+	$(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cc )
+.ENDIF
+.ENDIF
+
 .IF "$(ENABLE_PCH)"!=""
 $(SLO)$/precompiled.% .PHONY:
 	-$(MKDIRHIER) $(SLO)$/pch
@@ -194,6 +215,26 @@
 .ENDIF
 .ENDIF
 
+$(SLO)$/%.obj : $(MISC)$/%.cc
+	@echo ------------------------------
+	@echo Making: $@
+.IF "$(GUI)"=="UNX"
+.IF "$(TEST)"!=""
+	$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(MISC)$/$*.cc
+.ELSE
+	@$(RM) $@ $(@:s/.obj/.o/)
+	$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cc
+.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
+    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
+.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
+	+$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
+.ENDIF
+.ELSE
+	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cc )
+	@+$(ECHONL)
+	$(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cc )
+.ENDIF
+
 $(OBJ)$/%.obj : $(MISC)$/%.cxx
 	@echo ------------------------------
 	@echo Making: $@
Index: solenv/inc/unxlngi6.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxlngi6.mk,v
retrieving revision 1.37
retrieving revision 1.27.44.6
diff -u -b -I $Revision.*$ -I $Author.*$ -r1.37 -r1.27.44.6
Index: solenv/inc/unxmacx.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxmacx.mk,v
retrieving revision 1.18
retrieving revision 1.7.56.6
diff -u -b -I $Revision.*$ -I $Author.*$ -r1.18 -r1.7.56.6
Index: solenv/inc/unxsoli4.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxsoli4.mk,v
retrieving revision 1.36
retrieving revision 1.27.44.5
diff -u -b -I $Revision.*$ -I $Author.*$ -r1.36 -r1.27.44.5
Index: solenv/inc/unxsols4.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxsols4.mk,v
retrieving revision 1.42
retrieving revision 1.34.46.5
diff -u -b -I $Revision.*$ -I $Author.*$ -r1.42 -r1.34.46.5
Index: solenv/inc/wntmsci10.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/wntmsci10.mk,v
retrieving revision 1.31
retrieving revision 1.16.42.6
diff -u -b -I $Revision.*$ -I $Author.*$ -r1.31 -r1.16.42.6
Index: solenv/inc/wntmsci11.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/wntmsci11.mk,v
retrieving revision 1.13
retrieving revision 1.3.62.6
diff -u -b -I $Revision.*$ -I $Author.*$ -r1.13 -r1.3.62.6
--- solenv/inc/wntmsci11.mk	27 Jun 2007 14:03:25 -0000	1.13
+++ solenv/inc/wntmsci11.mk	24 Jul 2007 20:52:56 -0000	1.3.62.6
@@ -271,7 +271,6 @@
     xmloff \
     xmlsecurity
 
-
 CDEFS+=-DSTLPORT_VERSION=400 -DWINVER=0x400 -D_WIN32_IE=0x400
 CDEFS+=-D_MT
 
