From fbbbf6efa9760dc6c593e5570b799cf6c8e1ea59 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Fri, 1 Dec 2006 13:50:16 +0000 Subject: INTEGRATION: CWS sb23 (1.4.36); FILE MERGED 2006/08/18 16:19:10 sb 1.4.36.2: RESYNC: (1.4-1.6); FILE MERGED 2005/02/18 16:48:41 sb 1.4.36.1: #i35277# More cleanup; first part of supporting CurrentContext in URP. --- .../star/lib/uno/bridges/java_remote/makefile.mk | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/makefile.mk b/jurt/com/sun/star/lib/uno/bridges/java_remote/makefile.mk index ea92dfd818c4..1791811b90b2 100644 --- a/jurt/com/sun/star/lib/uno/bridges/java_remote/makefile.mk +++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: rt $ $Date: 2005-09-07 18:58:18 $ +# last change: $Author: rt $ $Date: 2006-12-01 14:50:16 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -33,16 +33,13 @@ # #************************************************************************* -PRJ = ..$/..$/..$/..$/..$/..$/.. -PRJNAME = jurt -PACKAGE = com$/sun$/star$/lib$/uno$/bridges$/java_remote -TARGET = com_sun_star_lib_uno_bridges_java_remote - -# --- Settings ----------------------------------------------------- +PRJ := ..$/..$/..$/..$/..$/..$/.. +PRJNAME := jurt -.INCLUDE : $(PRJ)$/util$/makefile.pmk +TARGET := com_sun_star_lib_uno_bridges_java_remote +PACKAGE = com$/sun$/star$/lib$/uno$/bridges$/java_remote -# --- Files -------------------------------------------------------- +.INCLUDE: $(PRJ)$/util$/makefile.pmk JAVAFILES = \ BridgedObject.java \ @@ -52,7 +49,4 @@ JAVAFILES = \ XConnectionOutputStream_Adapter.java \ java_remote_bridge.java -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - +.INCLUDE: target.mk -- cgit