drop unneeded odkcommon/

Change-Id: Id88a58e43fd7a39fdbc7545a0618b05070b1270e
Reviewed-on: https://gerrit.libreoffice.org/3776
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
This commit is contained in:
David Tardon 2013-05-04 14:08:33 +02:00
parent ffa50f643c
commit da7e3fca9f
2 changed files with 4 additions and 4 deletions

View file

@ -7,11 +7,11 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/settings))
$(eval $(call gb_CustomTarget_CustomTarget,odk/settings))
$(eval $(call gb_CustomTarget_register_target,odk/odkcommon/settings,dk.mk))
$(eval $(call gb_CustomTarget_register_target,odk/settings,dk.mk))
$(call gb_CustomTarget_get_workdir,odk/odkcommon/settings)/dk.mk : $(SRCDIR)/odk/pack/copying/dk.mk
$(call gb_CustomTarget_get_workdir,odk/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)/' \

View file

@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_Package_Package,odk_settings_generated,$(call gb_CustomTarget_get_workdir,odk/odkcommon/settings)))
$(eval $(call gb_Package_Package,odk_settings_generated,$(call gb_CustomTarget_get_workdir,odk/settings)))
$(eval $(call gb_Package_set_outdir,odk_settings_generated,$(INSTDIR)))