diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-06-06 14:06:48 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-06-06 14:06:48 +0200 |
| commit | b6212a4a950d9091aaad62022216e8aaaa074965 (patch) | |
| tree | ed81e5f1845d4bb2dcb73e4da0c3b73d247ef0e9 /connectivity/qa | |
| parent | f5e719d38e855484905b8f761a6779788b589546 (diff) | |
| parent | e12af87ff5f4a0d7b10133a9b3ddc114765607d6 (diff) | |
Merge remote-tracking branch 'origin/libreoffice-3-4'
Conflicts:
connectivity/qa/makefile.mk
sfx2/source/appl/appdata.cxx
sfx2/source/appl/appinit.cxx
sfx2/source/inc/appdata.hxx
sysui/desktop/productversion.mk
xmloff/source/forms/elementimport.cxx
Diffstat (limited to 'connectivity/qa')
| -rwxr-xr-x | connectivity/qa/makefile.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/connectivity/qa/makefile.mk b/connectivity/qa/makefile.mk index c087ab98bd7d..3081a751f07b 100755 --- a/connectivity/qa/makefile.mk +++ b/connectivity/qa/makefile.mk @@ -35,9 +35,8 @@ PACKAGE = complex/connectivity #----- compile .java files ----------------------------------------- -JAVAFILES := $(shell @$(FIND) complex -name "*.java") - JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar +JAVAFILES := $(shell @$(FIND) complex -name "*.java") .IF "$(SYSTEM_HSQLDB)" == "YES" EXTRAJARFILES = $(HSQLDB_JAR) |