ridljar etc.: javamaker invocations must rm -r targetdir

... because otherwise types that have been removed from the input rdb
still end up in the resulting jar file.

Change-Id: Ia73ecffcc9d831f2627ac0fcc5f57acf1f52a799

jurt/CustomTarget_test_urp.mk

@@ -34,6 +34,7 @@ $(call gb_CustomTarget_get_target,jurt/test/com/sun/star/lib/uno/protocols/urp)
 $(jurt_TESTURP)/done : $(jurt_TESTURP)/registry.rdb $(OUTDIR)/bin/types.rdb \
 		$(call gb_Executable_get_target_for_build,javamaker)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
+	rm -r $(jurt_TESTURP)/com && \
 	$(call gb_Helper_execute,javamaker -BUCR -O$(jurt_TESTURP) -nD $< -X$(OUTDIR)/bin/types.rdb) && \
 	touch $@
 

ridljar/CustomTarget_javamaker.mk

@@ -36,6 +36,7 @@ $(ridljar_DIR)/done : $(OUTDIR)/bin/udkapi.rdb \
 		| $(ridljar_DIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
 	$(call gb_Helper_abbreviate_dirs, \
+	rm -r $(ridljar_DIR) && \
 	$(call gb_Helper_execute,javamaker -BUCR -O$(ridljar_DIR) $<) && touch $@)
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:

testtools/CustomTarget_bridgetest_javamaker.mk

@@ -37,6 +37,7 @@ $(testtools_JAVADIR)/done : \
 		| $(testtools_JAVADIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
 	$(call gb_Helper_abbreviate_dirs, \
+	rm -r $(testtools_JAVADIR) && \
 	$(call gb_Helper_execute,javamaker -BUCR -nD -O$(testtools_JAVADIR) -X$(OUTDIR)/bin/types.rdb $<) && touch $@)
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:

touch/CustomTarget_touch_javamaker.mk

@@ -16,6 +16,7 @@ $(touch_javamaker_DIR)/done : $(call gb_UnoApiTarget_get_target,touch) $(OUTDIR)
 		$(call gb_Executable_get_target_for_build,javamaker) | $(touch_javamaker_DIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
 	$(call gb_Helper_abbreviate_dirs, \
+	rm -r $(touch_javamaker_DIR) && \
 	$(call gb_Helper_execute,javamaker -BUCR -nD -O$(touch_javamaker_DIR)/class -X$(OUTDIR)/bin/types.rdb $<) && touch $@)
 
 # vim: set noet sw=4 ts=4: