diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:37 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:37 +0200 |
| commit | 07c1d34ec78dd6e980c4ae370042ab5e3870aa0b (patch) | |
| tree | 15568d84be2d77cb24edb7e9cc53fa0b1ceef820 /solenv/gbuild/CppunitTest.mk | |
| parent | 23bfe8097571fcf5c9ac223100c2fef9087aad01 (diff) | |
| parent | b75801e6ace5eec09c5d04f2f0f9a373acc1a21c (diff) | |
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
configure.in
distro-configs/LibreOfficeMacOSX.conf
distro-configs/OxygenOfficeLinux.conf
distro-configs/OxygenOfficeWin32.conf
download
instsetoo_native/util/openoffice.lst
ooo.lst.in
set_soenv.in
solenv/bin/modules/installer/download.pm
solenv/gbuild/CppunitTest.mk
solenv/inc/minor.mk
solenv/inc/settings.mk
Diffstat (limited to 'solenv/gbuild/CppunitTest.mk')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index b7049af6cf97..3dbd33d7a0ae 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -43,7 +43,7 @@ endif # gb_CppunitTest_TARGETTYPE # gb_CppunitTest_get_filename gb_CppunitTest_CPPTESTTARGET := $(call gb_Executable_get_target,cppunit/cppunittester) -gb_CppunitTest_CPPTESTCOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND) STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) LANG=en_US.UTF-8 $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_CPPTESTTARGET) +gb_CppunitTest_CPPTESTCOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND) STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_CPPTESTTARGET) gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1)) # TODO: move this to platform under suitable name |