User: obo Date: 2006/09/15 06:53:51 Modified: dba/connectivity/source/drivers/mozab/makefile.mk
Log: INTEGRATION: CWS ause066 (1.21.144); FILE MERGED 2006/08/30 11:15:14 hjs 1.21.144.2: #i69093# cleanup variable usage 2006/08/30 10:21:48 oj 1.21.144.1: remove unused defines from version.mk 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.21&r2=1.22 Delta lines: +6 -17 -------------------- --- makefile.mk 21 Dec 2005 13:17:39 -0000 1.21 +++ makefile.mk 15 Sep 2006 13:53:48 -0000 1.22 @@ -35,8 +35,8 @@ PRJ=..$/..$/.. PRJINC=..$/.. PRJNAME=connectivity -TARGET=$(MOZAB_TARGET) -TARGET2=$(MOZAB_TARGET)drv +TARGET=mozab +TARGET2=$(TARGET)drv .IF ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" all: @@ -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 --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
