diff options
| author | sb <sb@openoffice.org> | 2010-04-15 09:27:52 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-04-15 09:27:52 +0200 |
| commit | d645c084e1aab909f21f51a8dec453c323bd9213 (patch) | |
| tree | 737f2045f56d1bbca5e35c8d767014304b9ade88 | |
| parent | cd6cdc2be3b081a80c8500a3b71a1ae12dd6bc9a (diff) | |
| parent | 71f68c04013ea7d80dbabf3e81df019f948e5eca (diff) | |
sb120: merged in backout from cws/sb118
| -rw-r--r-- | connectivity/prj/build.lst | 2 | ||||
| -rw-r--r-- | connectivity/qa/connectivity/tools/makefile.mk | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst index dd386c7c7161..0b15c06acf15 100644 --- a/connectivity/prj/build.lst +++ b/connectivity/prj/build.lst @@ -1,4 +1,4 @@ -cn connectivity : shell l10n comphelper MOZ:moz SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb QADEVOOO:qadevOOo officecfg NSS:nss NULL +cn connectivity : shell l10n comphelper MOZ:moz SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg NSS:nss NULL cn connectivity usr1 - all cn_mkout NULL cn connectivity\inc nmake - all cn_inc NULL cn connectivity\com\sun\star\sdbcx\comp\hsqldb nmake - all cn_jhsqldbdb cn_hsqldb cn_inc NULL diff --git a/connectivity/qa/connectivity/tools/makefile.mk b/connectivity/qa/connectivity/tools/makefile.mk index 0f3c9c84b92e..07490532a1b1 100644 --- a/connectivity/qa/connectivity/tools/makefile.mk +++ b/connectivity/qa/connectivity/tools/makefile.mk @@ -38,7 +38,6 @@ all: @echo "Java not available. Build skipped" .ELSE -.IF "$(BUILD_QADEVOOO)" == "YES" #----- compile .java files ----------------------------------------- JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunnerLight.jar @@ -61,8 +60,6 @@ ALL : ALLTAR ALL: ALLDEP .ENDIF -.ENDIF - .ENDIF # "$(SOLAR_JAVA)" == "" .INCLUDE : target.mk |