diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-28 11:01:50 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-28 14:01:08 +0100 |
| commit | 968c735aa7bcf8d03258e9cea931b9d776e4a890 (patch) | |
| tree | 8e7fc716f22210c002f39547c1d6e680c75dff21 /cli_ure | |
| parent | 6bd0f9ba9d744b6d269eac72ae62e0bbd122a9a4 (diff) | |
gbuild: refactor CliLibrary
- stop copying the DLL to OUTDIR
- since that was the main reason for the separation between
CliLibrary and CliLibraryTarget, merge the targets;
the newly inherited variables are not expected to cause problems
- hardcode target to URE bin dir for now, no immediate need for
multiple layers
Change-Id: If0fea1337349c41f231c8cde122852c71d5080a7
Diffstat (limited to 'cli_ure')
| -rw-r--r-- | cli_ure/Executable_climaker.mk | 2 | ||||
| -rw-r--r-- | cli_ure/Library_cli_cppuhelper_native.mk | 2 | ||||
| -rw-r--r-- | cli_ure/Library_cli_uno.mk | 2 | ||||
| -rw-r--r-- | cli_ure/Package_cli_basetypes_copy.mk | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/cli_ure/Executable_climaker.mk b/cli_ure/Executable_climaker.mk index f1aaf62914ae..2d99b1f6670e 100644 --- a/cli_ure/Executable_climaker.mk +++ b/cli_ure/Executable_climaker.mk @@ -14,7 +14,7 @@ $(eval $(call gb_Executable_use_package,climaker,\ )) $(eval $(call gb_Executable_add_cxxflags,climaker,\ - -AI $(gb_Helper_OUTDIRLIBDIR) \ + -AI $(INSTDIR)/$(LIBO_URE_LIB_FOLDER) \ -clr \ -LN \ -wd4339 \ diff --git a/cli_ure/Library_cli_cppuhelper_native.mk b/cli_ure/Library_cli_cppuhelper_native.mk index cc4e628a4751..39c13c8cfbc5 100644 --- a/cli_ure/Library_cli_cppuhelper_native.mk +++ b/cli_ure/Library_cli_cppuhelper_native.mk @@ -14,7 +14,7 @@ $(eval $(call gb_Library_Assembly,cli_cppuhelper)) # When compiling for CLR, disable "warning C4339: use of undefined type detected # in CLR meta-data - use of this type may lead to a runtime exception": $(eval $(call gb_Library_add_cxxflags,cli_cppuhelper,\ - -AI $(gb_Helper_OUTDIRLIBDIR) \ + -AI $(INSTDIR)/$(LIBO_URE_LIB_FOLDER) \ -clr \ -wd4339 \ )) diff --git a/cli_ure/Library_cli_uno.mk b/cli_ure/Library_cli_uno.mk index a215e9fc94be..58b2d4fe67d5 100644 --- a/cli_ure/Library_cli_uno.mk +++ b/cli_ure/Library_cli_uno.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Library_Library,cli_uno)) $(eval $(call gb_Library_add_cxxflags,cli_uno,\ - -AI $(gb_Helper_OUTDIRLIBDIR) \ + -AI $(INSTDIR)/$(LIBO_URE_LIB_FOLDER) \ -clr \ -wd4339 \ )) diff --git a/cli_ure/Package_cli_basetypes_copy.mk b/cli_ure/Package_cli_basetypes_copy.mk index b0824e3bcb38..8cb20cecdb82 100644 --- a/cli_ure/Package_cli_basetypes_copy.mk +++ b/cli_ure/Package_cli_basetypes_copy.mk @@ -8,13 +8,13 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,cli_basetypes_copy,$(WORKDIR))) +$(eval $(call gb_Package_Package,cli_basetypes_copy,$(INSTROOT))) $(eval $(call gb_Package_set_outdir,cli_basetypes_copy,$(INSTDIR))) # duplicate copy to work around CLR DLL finding brain damage $(eval $(call gb_Package_add_files,cli_basetypes_copy,$(SDKDIRNAME)/bin,\ - CliLibraryTarget/cli_basetypes.dll \ + $(LIBO_URE_LIB_FOLDER)/cli_basetypes.dll \ )) # vim: set noet sw=4 ts=4: |