diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-24 21:58:38 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-25 11:42:40 +0200 |
| commit | 8e602afd1e999e984e18d984a9986324831ac881 (patch) | |
| tree | c963379f4e317fa1f2b3d430adbb01da2088b252 /odk | |
| parent | 7da7682965c0465a4c6ae017870daadc2b9ac099 (diff) | |
stop looking for Jar files in solver
Change-Id: I4d2a93fa7395354fbf2893df9e254ab39fa365af
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/CustomTarget_javadoc.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/odk/CustomTarget_javadoc.mk b/odk/CustomTarget_javadoc.mk index 5527fe3332f8..c5e3e67e2ae8 100644 --- a/odk/CustomTarget_javadoc.mk +++ b/odk/CustomTarget_javadoc.mk @@ -28,7 +28,8 @@ $(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/%.html : \ $(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt touch $@ -$(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt : $(call gb_Jar_get_outdir_target,ridl) +$(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt : \ + $(call gb_Jar_get_target,ridl) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JDC,1) $(JAVADOC) -J-Xmx120m -use -splitindex \ -windowtitle "Java UNO Runtime Reference" \ @@ -36,7 +37,7 @@ $(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt : $(call g -tag attention:a:"Attention:" \ -d $(dir $@) \ -sourcepath "$(SRCDIR)/ridljar/source/unoloader$(gb_CLASSPATHSEP)$(SRCDIR)/ridljar$(gb_CLASSPATHSEP)$(SRCDIR)/jurt$(gb_CLASSPATHSEP)$(SRCDIR)/javaunohelper" \ - -classpath $(OUTDIR)/bin/ridl.jar \ + -classpath $(call gb_Jar_get_target,ridl) \ -linkoffline ../../common/reg $(SRCDIR)/odk/docs/java-uno \ -linkoffline http://java.sun.com/j2se/1.5/docs/api $(SRCDIR)/odk/docs/java \ $(odk_JAVAPACKAGES) \ |