diff options
| author | David Tardon <dtardon@redhat.com> | 2013-04-21 17:38:36 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-04-22 07:05:10 +0000 |
| commit | 60b2b24d8e5c2a63cdac0f0c6141c8bbd95f1960 (patch) | |
| tree | 126457d263d66a2a0ebb1b0ee20bfa1ec4951235 /odk/CustomTarget_settings.mk | |
| parent | 4f4344b51599d7fd7febeefa4fa46c38c36af57b (diff) | |
replace CustomTarget_odk/odkcommon/settings by Package
Change-Id: Iee97a510be822836b2115f50d0b1c9e7e14b5e1a
Reviewed-on: https://gerrit.libreoffice.org/3534
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'odk/CustomTarget_settings.mk')
| -rw-r--r-- | odk/CustomTarget_settings.mk | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/odk/CustomTarget_settings.mk b/odk/CustomTarget_settings.mk index 358561b99c22..581d522e01fb 100644 --- a/odk/CustomTarget_settings.mk +++ b/odk/CustomTarget_settings.mk @@ -9,25 +9,9 @@ $(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/settings)) -odk_SETTINGSLIST := settings.mk \ - std.mk \ - stdtarget.mk \ - $(if $(filter WNT,$(OS)),component.uno.def) - -define odk_settings -odkcommon_ZIPLIST += settings/$(1) -$(call gb_CustomTarget_get_target,odk/odkcommon/settings): $(odk_WORKDIR)/settings/$(1) -$(odk_WORKDIR)/settings/$(1): $(SRCDIR)/odk/settings/$(1) - mkdir -p $$(dir $$@) - $$(call gb_Output_announce,$$(subst $$(WORKDIR)/,,$$@),build,CPY,1) - cp $$< $$@ -endef - -$(foreach setting,$(odk_SETTINGSLIST),$(eval $(call odk_settings,$(setting)))) - -odkcommon_ZIPLIST += settings/dk.mk $(eval $(call gb_CustomTarget_register_target,odk/odkcommon/settings,dk.mk)) -$(odk_WORKDIR)/settings/dk.mk: $(SRCDIR)/odk/pack/copying/dk.mk + +$(call gb_CustomTarget_get_workdir,odk/odkcommon/settings)/dk.mk : $(SRCDIR)/odk/pack/copying/dk.mk $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,SED,1) tr -d "\015" < $< | sed -e 's/@@RELEASE@@/$(PRODUCTVERSION)/' \ -e 's/@@BUILDID@@/$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)/' \ |