diff options
Diffstat (limited to 'ridljar')
| -rw-r--r-- | ridljar/CustomTarget_javamaker.mk | 2 | ||||
| -rw-r--r-- | ridljar/Jar_ridl.mk | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/ridljar/CustomTarget_javamaker.mk b/ridljar/CustomTarget_javamaker.mk index d9b3a7b4249c..3486d918f20c 100644 --- a/ridljar/CustomTarget_javamaker.mk +++ b/ridljar/CustomTarget_javamaker.mk @@ -36,6 +36,6 @@ $(ridljar_DIR)/done : $(OUTDIR)/bin/udkapi.rdb \ | $(ridljar_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) $(call gb_Helper_abbreviate_dirs, \ - $(call gb_Helper_execute,javamaker -BUCR -O$(ridljar_DIR)/class $<) && touch $@) + $(call gb_Helper_execute,javamaker -BUCR -O$(ridljar_DIR) $<) && touch $@) # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/ridljar/Jar_ridl.mk b/ridljar/Jar_ridl.mk index e2452251c9e7..700508188172 100644 --- a/ridljar/Jar_ridl.mk +++ b/ridljar/Jar_ridl.mk @@ -31,14 +31,10 @@ $(eval $(call gb_Jar_use_customtargets,ridl,\ ridljar/javamaker \ )) -$(eval $(call gb_Jar_use_jars,ridl,\ - $(WORKDIR)/CustomTarget/ridljar/javamaker/class \ -)) - $(eval $(call gb_Jar_set_packageroot,ridl,com)) $(eval $(call gb_Jar_add_packagedirs,ridl,\ - $(WORKDIR)/CustomTarget/ridljar/javamaker/class/com \ + $(call gb_CustomTarget_get_workdir,ridljar/javamaker)/com \ )) $(eval $(call gb_Jar_add_sourcefiles,ridl,\ |