diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-02-09 13:19:09 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-02-09 14:32:06 +0000 |
| commit | bf4484037c4ccb31493c0d863b92ed6dbff9d1ad (patch) | |
| tree | 14263cd7eb06419884df75ef15c0fe450b566f40 /sd | |
| parent | 69aff995cb83cd702520999f592fe21a561042fa (diff) | |
fix filters test dependencies
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/CppunitTest_sd_filters_test.mk | 5 | ||||
| -rw-r--r-- | sd/Module_sd.mk | 4 | ||||
| -rw-r--r-- | sd/prj/build.lst | 2 |
3 files changed, 2 insertions, 9 deletions
diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index b4de440d40b6..54d83105a4c8 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -42,8 +42,6 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sd_filters_test, \ drawinglayer \ editeng \ fileacc \ - for \ - forui \ i18nisolang1 \ msfilter \ oox \ @@ -93,7 +91,6 @@ $(eval $(call gb_CppunitTest_add_components,sd_filters_test,\ dbaccess/util/dba \ fileaccess/source/fileacc \ filter/source/config/cache/filterconfig1 \ - forms/util/frm \ framework/util/fwk \ i18npool/util/i18npool \ oox/util/oox \ @@ -112,8 +109,6 @@ $(eval $(call gb_CppunitTest_add_components,sd_filters_test,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ - xmlsecurity/util/xsec_fw \ - xmlsecurity/util/xmlsecurity \ )) $(eval $(call gb_CppunitTest_add_old_components,sd_filters_test,\ diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk index b1dbe0c7e506..d4c080d1f977 100644 --- a/sd/Module_sd.mk +++ b/sd/Module_sd.mk @@ -43,10 +43,8 @@ $(eval $(call gb_Module_add_targets,sd,\ ifneq ($(OS),DRAGONFLY) $(eval $(call gb_Module_add_check_targets,sd,\ CppunitTest_sd_uimpress \ + CppunitTest_sd_filters_test \ )) -# disabled for now, seems to have incomplete deps and hangs on a build from scratch -# CppunitTest_sd_filters_test \ - endif diff --git a/sd/prj/build.lst b/sd/prj/build.lst index 3b37cc663471..b4dc93da6e47 100644 --- a/sd/prj/build.lst +++ b/sd/prj/build.lst @@ -1,3 +1,3 @@ -sd sd : filter TRANSLATIONS:translations animations configmgr svx sfx2 stoc canvas embeddedobj LIBXSLT:libxslt oox ure test xmloff NULL +sd sd : filter TRANSLATIONS:translations animations configmgr svx sfx2 stoc canvas embeddedobj LIBXSLT:libxslt oox ure test xmloff fileaccess unoxml dbaccess NULL sd sd usr1 - all sd_mkout NULL sd sd\prj nmake - all sd_prj NULL |