diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-28 10:01:34 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-28 14:01:07 +0100 |
| commit | decf809674a837bfddb5b9a376502927364377e8 (patch) | |
| tree | aaf3ba51d5a414e02e43983ed173331907101427 /cli_ure | |
| parent | a2f9c446b79d50d808bdc6e3487d230459f81260 (diff) | |
fdo#69601: refactor CliNativeLibrary
- stop copying the DLL to OUTDIR
- since that was the main reason for the separation between
CliNativeLibrary and CliNativeLibraryTarget, merge the targets;
the newly inherited variables are not expected to cause problems
- the Library remains in layer NONE; the derived CliNativeLibrary
is in INSTDIR
- hardcode target to URE bin dir for now, no immediate need for
multiple layers
Change-Id: I3bf4859e8c574f84d69eb43d12ddce0d34b5730c
Diffstat (limited to 'cli_ure')
| -rw-r--r-- | cli_ure/CliNativeLibrary_cli_cppuhelper.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cli_ure/CliNativeLibrary_cli_cppuhelper.mk b/cli_ure/CliNativeLibrary_cli_cppuhelper.mk index f9889dccbca1..5bc4f45e8b0a 100644 --- a/cli_ure/CliNativeLibrary_cli_cppuhelper.mk +++ b/cli_ure/CliNativeLibrary_cli_cppuhelper.mk @@ -9,17 +9,17 @@ include $(SRCDIR)/cli_ure/version/version.txt -$(eval $(call gb_CliNativeLibrary_CliNativeLibrary,assembly/cli_cppuhelper)) +$(eval $(call gb_CliNativeLibrary_CliNativeLibrary,cli_cppuhelper)) -$(eval $(call gb_CliNativeLibrary_wrap_library,assembly/cli_cppuhelper,cli_cppuhelper)) +$(eval $(call gb_CliNativeLibrary_wrap_library,cli_cppuhelper,cli_cppuhelper)) -$(eval $(call gb_CliNativeLibrary_set_configfile,assembly/cli_cppuhelper,cli_ure/source/native/cli_cppuhelper_config)) +$(eval $(call gb_CliNativeLibrary_set_configfile,cli_cppuhelper,cli_ure/source/native/cli_cppuhelper_config)) -$(eval $(call gb_CliNativeLibrary_set_keyfile,assembly/cli_cppuhelper,$(SRCDIR)/cli_ure/source/cliuno.snk)) +$(eval $(call gb_CliNativeLibrary_set_keyfile,cli_cppuhelper,$(SRCDIR)/cli_ure/source/cliuno.snk)) -$(eval $(call gb_CliNativeLibrary_set_policy,assembly/cli_cppuhelper,$(CLI_CPPUHELPER_POLICY_ASSEMBLY),$(CLI_CPPUHELPER_POLICY_VERSION))) +$(eval $(call gb_CliNativeLibrary_set_policy,cli_cppuhelper,$(CLI_CPPUHELPER_POLICY_ASSEMBLY),$(CLI_CPPUHELPER_POLICY_VERSION))) -$(eval $(call gb_CliNativeLibrary_use_assemblies,assembly/cli_cppuhelper,\ +$(eval $(call gb_CliNativeLibrary_use_assemblies,cli_cppuhelper,\ cli_ure \ cli_uretypes \ )) |