Kaydet (Commit) de471513 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

CustomTarget_include had apparently been forgotten

Change-Id: If61617ae3d18ef4f15f2d150af76f0b1b64a3fa6
üst 5d9cf23f
......@@ -7,6 +7,8 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/include))
include $(SRCDIR)/solenv/inc/udkversion.mk
odk_INCDIRLIST := sal salhelper rtl osl store typelib uno cppu cppuhelper \
......@@ -27,7 +29,7 @@ odk_INCLIST := $(subst $(OUTDIR)/inc/,,$(shell find \
define odk_inc
odkcommon_ZIPLIST += include/$(1)
$(call gb_CustomTarget_get_target,odk/odkcommon): $(odk_WORKDIR)/include/$(1)
$(call gb_CustomTarget_get_target,odk/odkcommon/include): $(odk_WORKDIR)/include/$(1)
$(odk_WORKDIR)/include/$(1): $(foreach dir,$(odk_INCDIRLIST),$(call gb_Package_get_target,$(dir)_inc))
mkdir -p $$(dir $$@)
$$(call gb_Output_announce,$$(subst $$(WORKDIR)/,,$$@),build,CPY,1)
......@@ -37,7 +39,7 @@ endef
$(foreach inc,$(odk_INCLIST),$(eval $(call odk_inc,$(inc))))
odkcommon_ZIPLIST += include/udkversion.mk
$(eval $(call gb_CustomTarget_register_target,odk/odkcommon,include/udkversion.mk))
$(eval $(call gb_CustomTarget_register_target,odk/odkcommon/include,include/udkversion.mk))
$(odk_WORKDIR)/include/udkversion.mk:
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
echo "#UDK version number" > $@
......
......@@ -21,6 +21,7 @@ $(call gb_CustomTarget_get_target,odk/odkcommon): \
$(call gb_CustomTarget_get_target,odk/odkcommon/bin) \
$(call gb_CustomTarget_get_target,odk/odkcommon/lib) \
$(call gb_CustomTarget_get_target,odk/odkcommon/idl) \
$(call gb_CustomTarget_get_target,odk/odkcommon/include) \
$(if $(filter MSC,$(COM)),$(call gb_CustomTarget_get_target,odk/odkcommon/cli))
ifeq ($(OS),WNT)
......
......@@ -19,6 +19,7 @@ $(eval $(call gb_Module_add_targets,odk,\
CustomTarget_settings \
CustomTarget_autodoc \
CustomTarget_idl \
CustomTarget_include \
Executable_unoapploader \
Zip_odkexamples \
))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment