diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2016-12-30 00:41:55 +0100 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2016-12-30 04:13:04 +0000 |
| commit | d019c7ffa84104fe2583174a6c0a34e68bb4a1d4 (patch) | |
| tree | 47320203932ff6968413fa0671a45b69d43546c3 | |
| parent | a7c51323b7343f82b5aea6098f5d5e31a8bad0e9 (diff) | |
Fix GbuildToJson for tests: Set source files correctly
Need newline in gb_LinkTarget_add_foo_object.
With that we can avoid direct gb_Executable_foo and gb_Library_foo.
Change-Id: I1e2b1ef2f2a3e15f4bb81170f23265186ef47733
Reviewed-on: https://gerrit.libreoffice.org/32503
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
| -rw-r--r-- | solenv/gbuild/extensions/post_GbuildToJson.mk | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk b/solenv/gbuild/extensions/post_GbuildToJson.mk index 856e2f79b174..7a2486904511 100644 --- a/solenv/gbuild/extensions/post_GbuildToJson.mk +++ b/solenv/gbuild/extensions/post_GbuildToJson.mk @@ -72,10 +72,30 @@ gb_LinkTarget_use_static_libraries = gb_UnoApiHeadersTarget_get_target = $(gb_Helper_MISCDUMMY) gb_UnpackedTarball_get_final_target = $(gb_Helper_MISCDUMMY) gb_LinkTarget__get_headers_check = -gb_LinkTarget_add_cobject = $(call gb_LinkTarget_get_target,$(1)) : COBJECTS += $(2) -gb_LinkTarget_add_cxxobject = $(call gb_LinkTarget_get_target,$(1)) : CXXOBJECTS += $(2) -gb_LinkTarget_add_generated_c_object = $(call gb_LinkTarget_get_target,$(1)) : GENCOBJECTS += $(2) -gb_LinkTarget_add_generated_cxx_object = $(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS += $(2) +define gb_LinkTarget_add_cobject +$(call gb_LinkTarget_get_target,$(1)) : COBJECTS += $(2) + +endef +define gb_LinkTarget_add_cxxobject +$(call gb_LinkTarget_get_target,$(1)) : CXXOBJECTS += $(2) + +endef +define gb_LinkTarget_add_generated_c_object +$(call gb_LinkTarget_get_target,$(1)) : GENCOBJECTS += $(2) + +endef +define gb_LinkTarget_add_generated_cxx_object +$(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS += $(2) + +endef +define gb_LinkTarget_add_objcobject +$(call gb_LinkTarget_get_target,$(1)) : OBJCOBJECTS += $(2) + +endef +define gb_LinkTarget_add_objcxxobject +$(call gb_LinkTarget_get_target,$(1)) : OBJCXXOBJECTS += $(2) + +endef gb_LinkTarget_use_package = gb_LinkTarget_add_sdi_headers = gb_LinkTarget_use_external_project = @@ -90,20 +110,6 @@ gb_LinkTarget_set_nativeres = gb_LinkTarget_add_nativeres = gb_Library_set_componentfile = gb_LinkTarget_use_restarget = -# TODO: curious these are needed in addition -gb_Executable_add_cxxobject = $(call gb_Executable_get_target,$(1)): CXXOBJECTS += $(2) -gb_Executable_add_cxxobjects = $(call gb_Executable_get_target,$(1)): CXXOBJECTS += $(2) -gb_Executable_add_exception_object = $(call gb_Executable_get_target,$(1)): CXXOBJECTS += $(2) -gb_Executable_add_exception_objects = $(call gb_Executable_get_target,$(1)): CXXOBJECTS += $(2) -gb_Library_add_cxxobject = $(call gb_Library_get_target,$(1)): CXXOBJECTS += $(2) -gb_Library_add_cxxobjects = $(call gb_Library_get_target,$(1)): CXXOBJECTS += $(2) -gb_Library_add_exception_object = $(call gb_Library_get_target,$(1)): CXXOBJECTS += $(2) -gb_Library_add_exception_objects = $(call gb_Library_get_target,$(1)): CXXOBJECTS += $(2) - -# Objective C++ macros -gb_Library_add_objcxxobjects = $(call gb_Library_get_target,$(1)): CXXOBJECTS += $(2) -gb_Library_add_objcobjects = $(call gb_Library_get_target,$(1)): CXXOBJECTS += $(2) - #$(call gb_Library_get_exports_target,%): $(WORKDIR)/LinkTarget/Library/%.exports: |