desktop: use CustomTarget makefile

desktop/scripts/Makefile → desktop/CustomTarget_soffice.mk

@@ -25,15 +25,18 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-soffice.sh : $(SRCDIR)/desktop/scripts/soffice.sh
+$(eval $(call gb_CustomTarget_CustomTarget,desktop/soffice,new_style))
+
+DESO := $(call gb_CustomTarget_get_workdir,desktop/soffice)
+
+$(call gb_CustomTarget_get_target,desktop/soffice) : $(DESO)/soffice.sh
+
+$(DESO)/soffice.sh : $(SRCDIR)/desktop/scripts/soffice.sh | $(DESO)/.dir
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
 ifneq ($(JITC_PROCESSOR_TYPE),)
 	sed -e "s/^#@JITC_PROCESSOR_TYPE_EXPORT@/export JITC_PROCESSOR_TYPE=$(JITC_PROCESSOR_TYPE)/" $< > $@
 else
 	cp $< $@
 endif
 
-.DEFAULT_GOAL := all
-.PHONY : all
-all : soffice.sh
-
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:

desktop/Module_desktop.mk

@@ -60,6 +60,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
 ifneq ($(OS),MACOSX)
 ifneq ($(OS),WNT)
 $(eval $(call gb_Module_add_targets,desktop,\
+    CustomTarget_soffice \
     Package_soffice_sh \
 ))
 endif

desktop/Package_soffice_sh.mk

@@ -25,14 +25,8 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Package_Package,desktop_soffice_sh,$(WORKDIR)/CustomTarget/desktop/scripts))
+$(eval $(call gb_Package_Package,desktop_soffice_sh,$(call gb_CustomTarget_get_workdir,desktop/soffice)))
 
 $(eval $(call gb_Package_add_file,desktop_soffice_sh,bin/soffice,soffice.sh))
 
-$(eval $(call gb_Package_add_customtarget,desktop_soffice_sh,desktop/scripts))
-
-$(eval $(call gb_CustomTarget_add_dependencies,desktop/scripts,\
-    desktop/scripts/soffice.sh \
-))
-
 # vim:set shiftwidth=4 softtabstop=4 expandtab: