diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-04-15 13:23:19 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-04-15 13:23:19 +0000 |
| commit | 3b5298917e61884d9344d4a0b266a88baad6ca58 (patch) | |
| tree | 6dd7cb0a3b46765b8a156478fa7f91c4615a7f95 /sc/util | |
| parent | 715d8d5ab5484ad517838a87ec4b69682e85c5a7 (diff) | |
INTEGRATION: CWS tune01 (1.15.4); FILE MERGED
2003/04/11 13:45:49 mhu 1.15.4.1: #108383# Need unconditional SCHLIB dependency.
Diffstat (limited to 'sc/util')
| -rw-r--r-- | sc/util/makefile.mk | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk index 712e94e08490..af7b30ed8bff 100644 --- a/sc/util/makefile.mk +++ b/sc/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.15 $ +# $Revision: 1.16 $ # -# last change: $Author: hr $ $Date: 2003-03-26 18:07:00 $ +# last change: $Author: vg $ $Date: 2003-04-15 14:23:19 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -110,10 +110,13 @@ SHL1TARGET= sc$(UPD)$(DLLPOSTFIX) SHL1VERSIONMAP= sc.map SHL1IMPLIB= sci -SHL1STDLIBS= \ +# static libraries +SHL1STDLIBS+= $(SCHLIB) + +# dynamic libraries +SHL1STDLIBS+= \ $(BASICLIB) \ $(SFXLIB) \ - $(SFXDEBUGLIB) \ $(SO2LIB) \ $(SVMEMLIB) \ $(SVTOOLLIB) \ @@ -121,14 +124,12 @@ SHL1STDLIBS= \ $(SVXLIB) \ $(GOODIESLIB) \ $(OFALIB) \ - $(SVLIB) \ + $(VCLLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB) \ $(COMPHELPERLIB) \ $(UCBHELPERLIB) \ - $(ONELIB) \ $(TKLIB) \ - $(UNOLIB) \ $(VOSLIB) \ $(SALLIB) \ $(TOOLSLIB) \ @@ -138,7 +139,6 @@ SHL1STDLIBS= \ $(DBTOOLSLIB) - SHL1DEPN= $(L)$/itools.lib SHL1LIBS= $(LIB3TARGET) $(LIB4TARGET) @@ -146,10 +146,6 @@ SHL1LIBS= $(LIB3TARGET) $(LIB4TARGET) SHL1OBJS= $(SLO)$/scdll.obj .ENDIF -.IF "$(GUI)"=="UNX" -SHL1STDLIBS+= $(SCHLIB) -.ENDIF - SHL1DEF= $(MISC)$/$(SHL1TARGET).def .IF "$(GUI)" == "WNT" || "$(GUI)" == "WNT" @@ -221,7 +217,7 @@ LIB5OBJFILES=$(OBJ)$/sclib.obj ALL: \ $(MISC)$/linkinc.ls \ ALLTAR \ - ea + ea .ENDIF # --- Targets ------------------------------------------------------------- @@ -300,9 +296,9 @@ $(MISC)$/$(SHL1TARGET).def: makefile.mk echo LIBRARY INITINSTANCE TERMINSTANCE >$@ echo DESCRIPTION 'ScDLL' >>$@ echo PROTMODE >>$@ - @echo CODE LOADONCALL >>$@ + @echo CODE LOADONCALL >>$@ @echo DATA PRELOAD MULTIPLE NONSHARED >>$@ - @echo EXPORTS >>$@ + @echo EXPORTS >>$@ .IF "$(COM)"!="ICC" @echo _CreateScDocShellDll @2 >>$@ @echo _CreateObjScDocShellDll @3 >>$@ @@ -322,7 +318,7 @@ $(MISC)$/$(SHL1TARGET).def: makefile.mk .ENDIF .ELSE @echo option DESCRIPTION 'ScDLL' >$@ - @echo name $(BIN)$/$(SHL1TARGET).dll >>$@ + @echo name $(BIN)$/$(SHL1TARGET).dll >>$@ @echo CreateScDocShellDll_ @2 >>temp.def @echo CreateObjScDocShellDll_ @3 >>temp.def @echo InitScDll_ @4 >>temp.def |