diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-02-27 15:54:55 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-02-27 17:09:47 +0100 |
| commit | e0beed468396d5f518b6468667775708c04da692 (patch) | |
| tree | 6f5b43a2fa33fe0112178c45108d595826915d89 /odk | |
| parent | f413decfefcd57d487a979aaacf3583efc9eb9c5 (diff) | |
remove odk/CustomTarget_include.mk and package udkversion.mk in sal
Change-Id: Iab7335bc440484a6c01700ae36d1e004f8e96be7
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/CustomTarget_include.mk | 20 | ||||
| -rw-r--r-- | odk/Module_odk.mk | 4 |
2 files changed, 3 insertions, 21 deletions
diff --git a/odk/CustomTarget_include.mk b/odk/CustomTarget_include.mk deleted file mode 100644 index 8f5cd974308a..000000000000 --- a/odk/CustomTarget_include.mk +++ /dev/null @@ -1,20 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# 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 - -odkcommon_ZIPLIST += 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) - cp $(BUILDDIR)/config_host/udkversion.mk $@ - -# vim: set noet sw=4 ts=4: diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index f93a6c6570f5..be1ec1efef89 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -9,6 +9,9 @@ $(eval $(call gb_Module_Module,odk)) +# needed in several makefiles here +include $(BUILDDIR)/config_host/udkversion.mk + $(eval $(call gb_Module_add_targets,odk,\ CustomTarget_odkcommon \ $(if $(filter WNT,$(OS)),CustomTarget_cli) \ @@ -19,7 +22,6 @@ $(eval $(call gb_Module_add_targets,odk,\ CustomTarget_settings \ CustomTarget_autodoc \ CustomTarget_idl \ - CustomTarget_include \ Executable_unoapploader \ Zip_odkexamples \ )) |