diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-28 12:54:49 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-28 14:03:14 +0100 |
| commit | 3af414b48b2882636de3ab8c84ab4c514daf6235 (patch) | |
| tree | ffa74044990d1cab2c6e9879c175ad5184cd5f66 /solenv | |
| parent | e5eac916e89d064fa2bb48b17e121e35da1141fc (diff) | |
gbuild: deliver CLI config and policy files to INSTDIR
Change-Id: I93aaf87b53c17fb143e6e6ae0bca60777dbb3eb5
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CliAssembly.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/CliLibrary.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/CliNativeLibrary.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/CliUnoApi.mk | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk index f8c6fdb8a729..7c6e3b7b2c45 100644 --- a/solenv/gbuild/CliAssembly.mk +++ b/solenv/gbuild/CliAssembly.mk @@ -148,9 +148,11 @@ $(call gb_CliAssembly_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),CLA,3) rm -f $(call gb_CliAssembly_get_target,$*) +# call gb_CliAssembly_CliAssembly,dllname,dlltarget define gb_CliAssembly_CliAssembly $(call gb_CliAssemblyTarget_CliAssemblyTarget,$(1)) $(call gb_Package_Package_internal,$(1)_assembly,$(WORKDIR)) +$(call gb_Package_set_outdir,$(1)_assembly,$(dir $(2))) $(call gb_CliAssembly_get_target,$(1)) : $(call gb_CliAssemblyTarget_get_target,$(1)) $(call gb_CliAssembly_get_target,$(1)) :| $(call gb_Package_get_target,$(1)_assembly) @@ -160,7 +162,7 @@ $(call gb_CliAssembly_get_clean_target,$(1)) : $(call gb_Package_get_clean_targe endef define gb_CliAssembly__add_file -$(call gb_Package_add_file,$(1)_assembly,bin/$(notdir $(2)),$(subst $(WORKDIR)/,,$(2))) +$(call gb_Package_add_file,$(1)_assembly,$(notdir $(2)),$(subst $(WORKDIR)/,,$(2))) endef diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk index bdfdf543aa7d..3883e7f63471 100644 --- a/solenv/gbuild/CliLibrary.mk +++ b/solenv/gbuild/CliLibrary.mk @@ -61,7 +61,7 @@ $(call gb_CliLibrary_get_clean_target,%) : # # gb_CliLibrary_CliLibrary target define gb_CliLibrary_CliLibrary -$(call gb_CliAssembly_CliAssembly,$(1)) +$(call gb_CliAssembly_CliAssembly,$(1),$(call gb_CliLibrary_get_target,$(1))) $(call gb_CliLibrary_get_target,$(1)) : CLI_ASSEMBLIES := $(call gb_CliLibrary_get_target,$(1)) : CLI_SOURCES := diff --git a/solenv/gbuild/CliNativeLibrary.mk b/solenv/gbuild/CliNativeLibrary.mk index 84c19c1e8473..be2862151a02 100644 --- a/solenv/gbuild/CliNativeLibrary.mk +++ b/solenv/gbuild/CliNativeLibrary.mk @@ -39,7 +39,7 @@ $(call gb_CliNativeLibrary_get_clean_target,%) : # # CliNativeLibrary target define gb_CliNativeLibrary_CliNativeLibrary -$(call gb_CliAssembly_CliAssembly,$(1)) +$(call gb_CliAssembly_CliAssembly,$(1),$(call gb_CliNativeLibrary_get_target,$(1))) $(call gb_CliNativeLibrary_get_target,$(1)) : CLI_NATIVE_ASSEMBLIES := $(gb_Helper_MISCDUMMY) $(call gb_CliNativeLibrary_get_target,$(1)) : CLI_NATIVE_KEYFILE := diff --git a/solenv/gbuild/CliUnoApi.mk b/solenv/gbuild/CliUnoApi.mk index 1ce38441ec23..16f331b48ec9 100644 --- a/solenv/gbuild/CliUnoApi.mk +++ b/solenv/gbuild/CliUnoApi.mk @@ -43,7 +43,7 @@ $(call gb_CliUnoApi_get_clean_target,%) : # # gb_CliUnoApi_CliUnoApi target define gb_CliUnoApi_CliUnoApi -$(call gb_CliAssembly_CliAssembly,$(1)) +$(call gb_CliAssembly_CliAssembly,$(1),$(call gb_CliUnoApi_get_target,$(1))) $(call gb_CliUnoApi_get_target,$(1)) : CLI_UNOAPI_API := $(call gb_CliUnoApi_get_target,$(1)) : CLI_UNOAPI_ASSEMBLIES := |