diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 12:28:29 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 12:28:29 +0000 |
| commit | d2b287cdd4f5bbe93b136d9f2bf2bf2cebfcbdb6 (patch) | |
| tree | 4f639206bc55b316e2be549cdb3d4db323fb3e0f /dbaccess/util | |
| parent | c8ebff286bc889d44236ab17de63fc3712c97acd (diff) | |
CWS-TOOLING: integrate CWS dba31b
Diffstat (limited to 'dbaccess/util')
| -rw-r--r-- | dbaccess/util/makefile.mk | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/dbaccess/util/makefile.mk b/dbaccess/util/makefile.mk index 6efdaf10a143..d9ccc3a5ffda 100644 --- a/dbaccess/util/makefile.mk +++ b/dbaccess/util/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.38 $ +# $Revision: 1.38.68.2 $ # # This file is part of OpenOffice.org. # @@ -46,7 +46,7 @@ LDUMP=ldump2.exe # --- database core (dba) ----------------------------------- -LIB1TARGET=$(SLB)$/dbaccess.lib +LIB1TARGET=$(SLB)$/$(TARGET).lib LIB1FILES=\ $(SLB)$/api.lib \ $(SLB)$/dataaccess.lib \ @@ -75,10 +75,16 @@ SHL1STDLIBS= \ $(FWELIB) \ $(SALHELPERLIB) +SHL1DEPN= +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 +SHL1USE_EXPORTS=name # --- .res file ---------------------------------------------------------- @@ -127,6 +133,15 @@ SHL2STDLIBS= \ $(SO2LIB) \ $(VOSLIB) \ $(SALLIB) + +.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC" +SHL2STDLIBS+= \ + -l$(TARGET)$(DLLPOSTFIX) +.ELSE +SHL2STDLIBS+= \ + i$(TARGET).lib +.ENDIF + SHL2DEPN= SHL2IMPLIB=i$(TARGET2) @@ -140,6 +155,7 @@ DEF2DEPN= $(MISC)$/$(SHL2TARGET).flt \ SHL2USE_EXPORTS=name ALL: \ + $(LIB1TARGET) \ $(LIB2TARGET) \ ALLTAR @@ -211,6 +227,11 @@ $(MISC)$/$(SHL2TARGET).flt: makefile.mk @echo CLEAR_THE_FILE > $@ @echo _TI >>$@ @echo _real >>$@ -.ENDIF +$(MISC)$/$(SHL1TARGET).flt: makefile.mk + @echo ------------------------------ + @echo CLEAR_THE_FILE > $@ + @echo _TI >>$@ + @echo _real >>$@ +.ENDIF |