diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-03-30 20:29:04 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-04-04 11:31:55 +0200 |
| commit | d5c18a48f82a7336536b6a353f267aefc1142455 (patch) | |
| tree | ffef355ba6f5431be491af21ceaa93c843725adc /desktop | |
| parent | 4873eb6f5c79f3637b209888b7ddb51d66abbfb6 (diff) | |
desktop: use CustomTarget makefile
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/CustomTarget_soffice.mk (renamed from desktop/scripts/Makefile) | 13 | ||||
| -rw-r--r-- | desktop/Module_desktop.mk | 1 | ||||
| -rw-r--r-- | desktop/Package_soffice_sh.mk | 8 |
3 files changed, 10 insertions, 12 deletions
diff --git a/desktop/scripts/Makefile b/desktop/CustomTarget_soffice.mk index a654b6b22a6d..5e12856db345 100644 --- a/desktop/scripts/Makefile +++ b/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: diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index c861ae80f82b..abafafb3faaf 100644 --- a/desktop/Module_desktop.mk +++ b/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 diff --git a/desktop/Package_soffice_sh.mk b/desktop/Package_soffice_sh.mk index 5cf1df356a58..48a1f9c8faf0 100644 --- a/desktop/Package_soffice_sh.mk +++ b/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: |