From 2038d1496dc652b517c9b6b71cdae848bcec2ab8 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 4 Mar 2011 14:59:30 +0100 Subject: dba34d: #i116795# compile with system HSQL --- connectivity/qa/makefile.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'connectivity/qa') diff --git a/connectivity/qa/makefile.mk b/connectivity/qa/makefile.mk index ee41cab63554..c087ab98bd7d 100644 --- a/connectivity/qa/makefile.mk +++ b/connectivity/qa/makefile.mk @@ -35,9 +35,16 @@ PACKAGE = complex/connectivity #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar hsqldb.jar JAVAFILES := $(shell @$(FIND) complex -name "*.java") +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar + +.IF "$(SYSTEM_HSQLDB)" == "YES" +EXTRAJARFILES = $(HSQLDB_JAR) +.ELSE +JARFILES += hsqldb.jar +.ENDIF + #----- make a jar from compiled files ------------------------------ JARCLASSDIRS = $(PACKAGE) -- cgit