# -*- 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_Package_Package,odk_cli,$(OUTDIR)/bin))

$(eval $(call gb_Package_set_outdir,odk_cli,$(INSTDIR)))

$(eval $(call gb_Package_add_files,odk_cli,$(SDKDIRNAME)/cli,\
	cli_basetypes.dll \
	cli_oootypes.dll \
	cli_ure.dll \
	cli_uretypes.dll \
))

# vim: set noet sw=4 ts=4:

# -*- 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_Package_Package,odk_cli,$(OUTDIR)/bin))

$(eval $(call gb_Package_set_outdir,odk_cli,$(INSTDIR)))

$(eval $(call gb_Package_add_files,odk_cli,$(SDKDIRNAME)/cli,\
	assembly/cli_cppuhelper.dll \
	cli_basetypes.dll \
	cli_oootypes.dll \
	cli_ure.dll \
	cli_uretypes.dll \
))

# vim: set noet sw=4 ts=4:

Install SDK cli/cli_cppuhelper.dll after all
Install SDK cli/cli_cppuhelper.dll after all

Instead of removing it from odk/Package_cli.mk,
c0c7df91469d3306baa6708b0a8ab4eadc0e9097 "odk: remove cli_cppuhelper from
Package_cli" should have referenced it from solver's bin/assembly/, where it got
moved by 8865b7f013bcd9b4ce41dd98be28ba28aeb22e66 "fdo#55290: use the right
native library name."  (And "It is actually installed by
scp2/source/ooo/ure.scp" too, indeed, but that is a red herring and is true for
all the SDK cli/cli_*.dll files.  My take is that they are required twice, once
in the GAC, which the scp2 settings are for, and once for SDK code to link
against.  Note e.g. the reference to cli_cppuhelper.dll in
odk/examples/CLI/CSharp/Spreadsheet/Makefile, building which from within the SDK
failed now without this fix.)

Change-Id: Ia906a4dc23e1e232ddb3dfac49dd190d1de45917
