diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-04-15 12:33:01 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-04-15 12:33:01 +0000 |
| commit | 36dd09e8115c249fe398ba1c2d93cab52e8c9279 (patch) | |
| tree | 12f91e0bea4014c02524157f53c8c189135ee0fa /dbaccess/util | |
| parent | fde3b755d0d5147ad63373d44f94d96849b730d1 (diff) | |
INTEGRATION: CWS tune01 (1.19.20.1.32); FILE MERGED
2003/04/11 13:32:52 mhu 1.19.20.1.32.3: #i12692# Need USE_DEFFILE when not using SHLxIMPLIB.
2003/04/02 19:01:24 mhu 1.19.20.1.32.2: #108383# Removed excess shared library dependencies.
2003/03/28 11:11:06 oj 1.19.20.1.32.1: #i12692# add map file
Diffstat (limited to 'dbaccess/util')
| -rw-r--r-- | dbaccess/util/makefile.mk | 63 |
1 files changed, 25 insertions, 38 deletions
diff --git a/dbaccess/util/makefile.mk b/dbaccess/util/makefile.mk index fb77297c5038..a3440b7f65e0 100644 --- a/dbaccess/util/makefile.mk +++ b/dbaccess/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.20 $ +# $Revision: 1.21 $ # -# last change: $Author: hr $ $Date: 2003-03-19 17:53:10 $ +# last change: $Author: vg $ $Date: 2003-04-15 13:33:01 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -64,12 +64,10 @@ PRJ=.. PRJNAME=dbaccess TARGET=dba TARGET2=dbu -USE_LDUMP2=TRUE +USE_DEFFILE=TRUE GEN_HID=TRUE GEN_HID_OTHER=TRUE -USE_DEFFILE=TRUE - # --- Settings ---------------------------------- .INCLUDE : svpre.mk @@ -91,32 +89,24 @@ LIB1FILES=\ SHL1TARGET=$(TARGET)$(UPD)$(DLLPOSTFIX) SHL1STDLIBS= \ - $(SALLIB) \ - $(OSLLIB) \ - $(ONELIB) \ - $(TOOLSLIB) \ - $(VOSLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ + $(SVTOOLLIB) \ $(VCLLIB) \ $(UNOTOOLSLIB) \ - $(SVLLIB) \ - $(COMPHELPERLIB) \ - $(SVTOOLLIB) \ + $(TOOLSLIB) \ $(DBTOOLSLIB) \ - $(COMPHELPERLIB) - - -.IF "$(COMPHELPERLIB)" == "" -SHL1STDLIBS+= icomphelp2.lib -.ENDIF + $(COMPHELPERLIB) \ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(VOSLIB) \ + $(SALLIB) SHL1LIBS=$(LIB1TARGET) SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=$(TARGET).dxp +SHL1VERSIONMAP=$(TARGET).map # --- .res file ---------------------------------------------------------- + RES1FILELIST=\ $(SRS)$/core_strings.srs @@ -140,37 +130,35 @@ LIB2FILES=\ SHL2TARGET=$(TARGET2)$(UPD)$(DLLPOSTFIX) SHL2STDLIBS= \ - $(SALLIB) \ - $(OSLLIB) \ - $(ONELIB) \ - $(VOSLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(UNOTOOLSLIB) \ - $(VCLLIB) \ - $(TOOLSLIB) \ + $(SVXLIB) \ $(SFXLIB) \ - $(SVLLIB) \ + $(BASICLIB) \ $(SVTOOLLIB) \ $(TKLIB) \ - $(COMPHELPERLIB) \ - $(SVXLIB) \ + $(VCLLIB) \ + $(SVLLIB) \ $(SOTLIB) \ - $(SO2LIB) \ + $(UNOTOOLSLIB) \ + $(TOOLSLIB) \ $(UCBHELPERLIB) \ $(DBTOOLSLIB) \ - $(BASICLIB) + $(COMPHELPERLIB) \ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(VOSLIB) \ + $(SALLIB) SHL2LIBS=$(LIB2TARGET) SHL2DEF=$(MISC)$/$(SHL2TARGET).def DEF2NAME=$(SHL2TARGET) -DEF2EXPORTFILE=$(TARGET2).dxp +SHL2VERSIONMAP=$(TARGET2).map ALL: \ $(LIB2TARGET) \ ALLTAR # --- .res file ---------------------------------------------------------- + RES2FILELIST=\ $(SRS)$/uidlg.srs \ $(SRS)$/uicontrols.srs \ @@ -187,4 +175,3 @@ RESLIB2SRSFILES=$(RES2FILELIST) # --- Targets ---------------------------------- .INCLUDE : target.mk - |