diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-10-28 15:23:31 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-10-28 15:23:31 +0000 |
| commit | 6be38a4f1c4ac9bc647204f60816af9b7716628b (patch) | |
| tree | dca4952828a559ec241c67e0ab9b55bb8b4d34db /vcl | |
| parent | bf3caf8afaec110857a32cd129ee9d85fcb24970 (diff) | |
INTEGRATION: CWS valgrind02 (1.2.230); FILE MERGED
2004/10/08 16:31:12 mhu 1.2.230.2: #i35209# salmain.o needs to be an SLO, i.e. PIC, and not linked into vcl.
2004/10/08 16:06:23 mhu 1.2.230.1: #i35209# Adapted salmain.cxx to use SAL_IMPLEMENT_MAIN() macro as recommended.
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/source/plugadapt/makefile.mk | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/vcl/unx/source/plugadapt/makefile.mk b/vcl/unx/source/plugadapt/makefile.mk index b75423ab6b64..d89737ba7fbe 100644 --- a/vcl/unx/source/plugadapt/makefile.mk +++ b/vcl/unx/source/plugadapt/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: kz $ $Date: 2003-11-18 14:46:57 $ +# last change: $Author: rt $ $Date: 2004-10-28 16:23:31 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -64,6 +64,8 @@ PRJ=..$/..$/.. PRJNAME=vcl TARGET=salplug +LIBTARGET=NO + .INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Settings ----------------------------------------------------- @@ -83,11 +85,13 @@ dummy: CFLAGS+=-DSAL_DLLPOSTFIX=\"$(DLLPOSTFIX)\" -OBJFILES=$(OBJ)$/salmain.obj - SLOFILES=\ - $(SLO)$/salplug.obj\ - $(SLO)$/salmain.obj\ + $(SLO)$/salmain.obj \ + $(SLO)$/salplug.obj + +LIB1TARGET=$(SLB)$/$(TARGET).lib +LIB1OBJFILES=\ + $(SLO)$/salplug.obj .ENDIF # "$(GUIBASE)"!="unx" |