User: rt Date: 2007-07-06 08:46:46+0000 Modified: dba/dbaccess/util/makefile.mk
Log: INTEGRATION: CWS oj14 (1.25.8); FILE MERGED 2007/06/23 21:23:18 fs 1.25.8.7: RESYNC: (1.29-1.30); FILE MERGED 2007/04/18 12:11:12 oj 1.25.8.6: RESYNC: (1.28-1.29); FILE MERGED 2007/04/05 08:05:16 lla 1.25.8.5: #146843# 2007/02/20 15:53:10 oj 1.25.8.4: RESYNC: (1.27-1.28); FILE MERGED 2006/11/07 09:59:06 oj 1.25.8.3: RESYNC: (1.26-1.27); FILE MERGED 2006/07/04 08:28:17 oj 1.25.8.2: RESYNC: (1.25-1.26); FILE MERGED 2006/01/03 08:07:52 oj 1.25.8.1: export controller class File Changes: Directory: /dba/dbaccess/util/ ============================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/dbaccess/util/makefile.mk?r1=1.30&r2=1.31 Delta lines: +17 -1 -------------------- --- makefile.mk 2007-06-05 14:42:12+0000 1.30 +++ makefile.mk 2007-07-06 08:46:44+0000 1.31 @@ -128,10 +128,16 @@ $(VOSLIB) \ $(SALLIB) +SHL2DEPN= +SHL2IMPLIB=i$(TARGET2) SHL2LIBS=$(LIB2TARGET) SHL2DEF=$(MISC)$/$(SHL2TARGET).def DEF2NAME=$(SHL2TARGET) -SHL2VERSIONMAP=$(TARGET2).map +DEFLIB2NAME=$(TARGET2) +DEF2DEPN= $(MISC)$/$(SHL2TARGET).flt \ + $(SLB)$/$(TARGET2).lib +# SHL2VERSIONMAP=$(TARGET2).map +SHL2USE_EXPORTS=ordinal ALL: \ $(LIB2TARGET) \ @@ -198,3 +204,13 @@ # --- Targets ---------------------------------- .INCLUDE : target.mk +.IF "$(depend)"=="" + +$(MISC)$/$(SHL2TARGET).flt: makefile.mk + @echo ------------------------------ + @echo CLEAR_THE_FILE > $@ + @echo _TI >>$@ + @echo _real >>$@ +.ENDIF + + --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
