diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-03-04 14:59:30 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-03-04 14:59:30 +0100 |
| commit | 2038d1496dc652b517c9b6b71cdae848bcec2ab8 (patch) | |
| tree | 7eb8bf700e786b3c997a049e447c97836a1e1dd2 /connectivity | |
| parent | Automated merge with file:///cws/so-cwsserv03/dba34c/DEV300/ooo (diff) | |
| download | core-2038d1496dc652b517c9b6b71cdae848bcec2ab8.tar.gz core-2038d1496dc652b517c9b6b71cdae848bcec2ab8.zip | |
dba34d: #i116795# compile with system HSQL
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/qa/makefile.mk | 9 |
1 files changed, 8 insertions, 1 deletions
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) |