Tag: cws_dev300_dba31b User: oj Date: 2008-08-12 10:28:00+0000 Modified: dba/dbaccess/util/makefile.mk
Log: #i92092# moved dsntypes to dba File Changes: Directory: /dba/dbaccess/util/ ============================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/dbaccess/util/makefile.mk?r1=1.38&r2=1.38.68.1 Delta lines: +25 -5 -------------------- --- makefile.mk 2008-04-10 16:59:28+0000 1.38 +++ makefile.mk 2008-08-12 10:27:57+0000 1.38.68.1 @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.38 $ +# $Revision: 1.38.68.1 $ # # This file is part of OpenOffice.org. # @@ -46,7 +46,7 @@ # --- database core (dba) ----------------------------------- -LIB1TARGET=$(SLB)$/dbaccess.lib +LIB1TARGET=$(SLB)$/$(TARGET).lib LIB1FILES=\ $(SLB)$/api.lib \ $(SLB)$/dataaccess.lib \ @@ -75,10 +75,15 @@ $(FWELIB) \ $(SALHELPERLIB) +SHL1IMPLIB=i$(TARGET) SHL1LIBS=$(LIB1TARGET) SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) -SHL1VERSIONMAP=$(TARGET).map +DEFLIB1NAME=$(TARGET) +DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt \ + $(SLB)$/$(TARGET).lib +# SHL1VERSIONMAP=$(TARGET).map +SHL2USE_EXPORTS=name # --- .res file ---------------------------------------------------------- @@ -128,6 +133,15 @@ $(VOSLIB) \ $(SALLIB) +.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC" +SHL2STDLIBS+= \ + -l$(TARGET)$(DLLPOSTFIX) +.ELSE +SHL2STDLIBS+= \ + i$(TARGET).lib +.ENDIF + + SHL2DEPN= SHL2IMPLIB=i$(TARGET2) SHL2LIBS=$(LIB2TARGET) @@ -140,6 +154,7 @@ SHL2USE_EXPORTS=name ALL: \ + $(LIB1TARGET) \ $(LIB2TARGET) \ ALLTAR @@ -211,6 +226,11 @@ @echo CLEAR_THE_FILE > $@ @echo _TI >>$@ @echo _real >>$@ -.ENDIF +$(MISC)$/$(SHL1TARGET).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]
