From 765599146d703a6ff75ed45e19786087ec54c594 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Thu, 7 Jul 2005 12:21:12 +0000 Subject: INTEGRATION: CWS jl22 (1.56.36); FILE MERGED 2005/06/24 12:54:21 jl 1.56.36.2: #i37020 2005/06/23 08:23:40 jl 1.56.36.1: #i37020# javainteractionhandler is now in swtools. Therfore remove JVMFWKLIB and add svtools --- desktop/util/makefile.mk | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'desktop') diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index d39bbd07cd57..06778b4047db 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.56 $ +# $Revision: 1.57 $ # -# last change: $Author: obo $ $Date: 2005-05-02 13:22:10 $ +# last change: $Author: obo $ $Date: 2005-07-07 13:21:12 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -89,7 +89,6 @@ TARGETOBJS= \ $(OBJ)$/desktopresid.obj \ $(OBJ)$/dispatchwatcher.obj \ $(OBJ)$/configinit.obj \ - $(OBJ)$/javainteractionhandler.obj \ $(OBJ)$/checkinstall.obj \ $(OBJ)$/cmdlinehelp.obj \ $(OBJ)$/langselect.obj \ @@ -142,8 +141,9 @@ APP1STDLIBS= \ $(CPPULIB) \ $(TKLIB) \ $(SALLIB) \ - $(JVMFWKLIB) \ - $(SVXLIB) + $(SVXLIB) + + # $(APP1_STDPRE) \ @@ -196,8 +196,9 @@ APP5STDLIBS= \ $(CPPUHELPERLIB) \ $(CPPULIB) \ $(SALLIB) \ - $(TKLIB) \ - $(JVMFWKLIB) + $(TKLIB) + + APP5OBJS=$(TARGETOBJS) APP5OBJS += $(OBJ)$/copyright_ascii_ooo.obj -- cgit