Tag: cws_src680_ause066 User: hjs Date: 2006/08/30 04:15:17 Modified: dba/connectivity/version.mk dba/connectivity/prj/d.lst dba/connectivity/source/drivers/mozab/makefile.mk dba/connectivity/source/resource/makefile.mk
Log: #i69093# cleanup variable usage File Changes: Directory: /dba/connectivity/ ============================= File [changed]: version.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/version.mk?r1=1.13.102.1&r2=1.13.102.2 Delta lines: +2 -5 ------------------- --- version.mk 30 Aug 2006 10:21:48 -0000 1.13.102.1 +++ version.mk 30 Aug 2006 11:15:13 -0000 1.13.102.2 @@ -4,9 +4,9 @@ # # $RCSfile: version.mk,v $ # -# $Revision: 1.13.102.1 $ +# $Revision: 1.13.102.2 $ # -# last change: $Author: oj $ $Date: 2006/08/30 10:21:48 $ +# last change: $Author: hjs $ $Date: 2006/08/30 11:15:13 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -104,9 +104,6 @@ # the micro DBTOOLS_MICRO=0 - -# ----------------------------conn/res settings-----------------------------------# -# target # -----------------------DRIVER MANAGER settings--------------------------------# # target Directory: /dba/connectivity/prj/ ================================= File [changed]: d.lst Url: http://dba.openoffice.org/source/browse/dba/connectivity/prj/d.lst?r1=1.25&r2=1.25.92.1 Delta lines: +1 -1 ------------------- --- d.lst 20 Apr 2006 14:04:43 -0000 1.25 +++ d.lst 30 Aug 2006 11:15:14 -0000 1.25.92.1 @@ -26,6 +26,6 @@ hedabu: ..\inc\connectivity\*.hxx %_DEST%\inc%_EXT%\connectivity\*.hxx hedabu: ..\%__SRC%\inc\sqlbison.hxx %_DEST%\inc%_EXT%\connectivity\sqlbison.hxx hedabu: ..\inc\connectivity\sdbcx\*.hxx %_DEST%\inc%_EXT%\connectivity\sdbcx\*.hxx -hedabu: ..\version.mk %_DEST%\inc%_EXT%\connectivity\version.mk +#hedabu: ..\version.mk %_DEST%\inc%_EXT%\connectivity\version.mk dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\lib%_EXT%\*.dylib; fi" 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.21.144.1&r2=1.21.144.2 Delta lines: +6 -17 -------------------- --- makefile.mk 30 Aug 2006 10:21:48 -0000 1.21.144.1 +++ makefile.mk 30 Aug 2006 11:15:14 -0000 1.21.144.2 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.21.144.1 $ +# $Revision: 1.21.144.2 $ # -# last change: $Author: oj $ $Date: 2006/08/30 10:21:48 $ +# last change: $Author: hjs $ $Date: 2006/08/30 11:15:14 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -67,10 +67,10 @@ .ENDIF .ENDIF -.IF "$(OS)"=="WNT" +.IF "$(COM)"=="MSC" LIB += $(MOZ_LIB) MOZ_LIB_XPCOM= $(MOZ_EMBED_LIB) $(MOZ_LIB)$/nspr4.lib $(MOZ_REG_LIB) $(MOZ_LIB)$/xpcom.lib -.ELSE "$(OS)"=="WNT" +.ELSE "$(COM)"=="MSC" MOZ_LIB_XPCOM= -L$(MOZ_LIB) -lembed_base_s -lnspr4 -lmozreg_s -lxpcom .ENDIF #End of mozilla specific stuff. @@ -78,10 +78,8 @@ # Disable '-z defs' due to broken libxpcom. LINKFLAGSDEFS=$(0) -USE_LDUMP2=TRUE USE_DEFFILE=TRUE ENABLE_EXCEPTIONS=TRUE -LDUMP=ldump2.exe # --- Settings ---------------------------------- @@ -162,6 +160,8 @@ $(SLO)$/MConnection.obj \ $(MOZSLOFILES) +DEPOBJFILES=$(SLO2FILES) + # --- MOZAB BASE Library ----------------------------------- SHL2VERSIONMAP= $(TARGET2).map @@ -193,26 +193,15 @@ # --- filter file ------------------------------ -.IF "$(depend)"=="" - $(MISC)$/$(SHL1TARGET).flt: makefile.mk @echo ------------------------------ @echo CLEAR_THE_FILE > $@ @echo _TI >>$@ @echo _real >>$@ -.ENDIF - -.IF "$(depend)"=="" $(MISC)$/$(SHL2TARGET).flt: makefile.mk @echo ------------------------------ @echo CLEAR_THE_FILE > $@ @echo _TI >>$@ @echo _real >>$@ -.ENDIF - -killdpc: - -+$(RM) $(DPCTARGET) - -+$(RM) $(DEPFILES) - @+echo Dependency files removed Directory: /dba/connectivity/source/resource/ ============================================= File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/resource/makefile.mk?r1=1.5.64.1&r2=1.5.64.2 Delta lines: +4 -3 ------------------- --- makefile.mk 30 Aug 2006 10:21:48 -0000 1.5.64.1 +++ makefile.mk 30 Aug 2006 11:15:15 -0000 1.5.64.2 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5.64.1 $ +# $Revision: 1.5.64.2 $ # -# last change: $Author: oj $ $Date: 2006/08/30 10:21:48 $ +# last change: $Author: hjs $ $Date: 2006/08/30 11:15:15 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -37,7 +37,6 @@ PRJINC=.. PRJNAME=connectivity TARGET=cnr -CDEFS+=-DCONN_SHARED_RESOURCE_FILE=$(TARGET) ENABLE_EXCEPTIONS=TRUE @@ -45,6 +44,8 @@ .IF "$(DBGUTIL_OJ)"!="" ENVCFLAGS+=/FR$(SLO)$/ .ENDIF + +CDEFS+=-DCONN_SHARED_RESOURCE_FILE=$(TARGET) .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/version.mk --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
