diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-03-13 14:18:52 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-03-13 14:33:55 +0100 |
| commit | 3f07029fc23923a290f94797a5d4b9b7276bca29 (patch) | |
| tree | 2d9d63b40dbc831957d1819d171bbfa373a18439 /odk | |
| parent | 14574684dd8ccc04db94b10b331765ca5aa1d781 (diff) | |
gbuild: refactor SDK packaging of IDL files:
- UnoApi: stop delivering IDL files to $(OUTDIR)/idl
- add ZipUnoApi to package IDL files for SDK
- convert udkapi and offapi to ZipUnoApi and package them in scp2
- odk: remove ugly CustomTarget_idl that uses "find"
Change-Id: I8dc4e0e7d0dc51c1abf18f31bfe095760d3c2104
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/CustomTarget_idl.mk | 22 | ||||
| -rw-r--r-- | odk/Module_odk.mk | 1 |
2 files changed, 0 insertions, 23 deletions
diff --git a/odk/CustomTarget_idl.mk b/odk/CustomTarget_idl.mk deleted file mode 100644 index b3ef74ed207b..000000000000 --- a/odk/CustomTarget_idl.mk +++ /dev/null @@ -1,22 +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/idl)) - -odkcommon_ZIPLIST += $(subst $(SRCDIR)/udkapi/,idl/,$(shell find $(SRCDIR)/udkapi/com -type f)) -odkcommon_ZIPLIST += $(subst $(SRCDIR)/offapi/,idl/,$(shell find $(SRCDIR)/offapi/com -type f)) - -$(call gb_CustomTarget_get_target,odk/odkcommon/idl) : - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CPY,1) - mkdir -p $(odk_WORKDIR)/idl - cp -rf $(SRCDIR)/udkapi/com $(odk_WORKDIR)/idl - cp -rf $(SRCDIR)/offapi/com $(odk_WORKDIR)/idl - touch $@ - -# vim: set noet sw=4 ts=4: diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index c66e1dd65a14..9a384d174a94 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -18,7 +18,6 @@ $(eval $(call gb_Module_add_targets,odk,\ CustomTarget_lib \ CustomTarget_settings \ CustomTarget_autodoc \ - CustomTarget_idl \ Executable_unoapploader \ Zip_odkexamples \ )) |