blob: 8601bc164d019df5f44c48dca71b36576e89e512 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
|
diff -r 4ab9e11cb892 connectivity/qa/makefile.mk
--- a/connectivity/qa/makefile.mk Thu Mar 03 15:22:23 2011 +0100
+++ b/connectivity/qa/makefile.mk Fri Mar 04 09:51:48 2011 +0100
@@ -35,9 +35,16 @@
#----- 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)
|
