From cd5cd12f3acb8be9169c28b4a9aed08ca77025f7 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Fri, 2 Nov 2007 11:12:48 +0000 Subject: [PATCH] INTEGRATION: CWS os2port02 (1.5.2); FILE MERGED 2007/10/04 19:47:14 ydario 1.5.2.1: Issue number: i82034 Submitted by: ydario Reviewed by: ydario Commit of changes for OS/2 CWS source code integration. --- connectivity/qa/connectivity/tools/makefile.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/connectivity/qa/connectivity/tools/makefile.mk b/connectivity/qa/connectivity/tools/makefile.mk index e6920e8350b6..e54515f65683 100644 --- a/connectivity/qa/connectivity/tools/makefile.mk +++ b/connectivity/qa/connectivity/tools/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: vg $ $Date: 2007-09-20 14:49:25 $ +# last change: $Author: hr $ $Date: 2007-11-02 12:12:48 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -51,7 +51,11 @@ all: JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar # Do not use $/ with the $(FIND) command as for W32-4nt this leads to a backslash # in a posix command. In this special case use / instead of $/ +.IF "$(GUI)"=="OS2" +JAVAFILES := $(shell ls ./*.java) +.ELSE JAVAFILES := $(shell $(FIND) ./*.java) +.ENDIF JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) #----- make a jar from compiled files ------------------------------