summaryrefslogtreecommitdiff
path: root/sfx2/Module_sfx2.mk
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2011-03-12 18:57:32 -0600
committerNorbert Thiebaud <nthiebaud@gmail.com>2011-03-12 18:57:32 -0600
commiteb90ab5a73149323b50f18a02968fbdcee539236 (patch)
treea1b812f444fd30bdd7882faaf9826c85980deed7 /sfx2/Module_sfx2.mk
parentf9c53ad052cb31b8ff2727526651a79f333e3bf6 (diff)
fix mis-merge all-around.
Diffstat (limited to 'sfx2/Module_sfx2.mk')
-rwxr-xr-xsfx2/Module_sfx2.mk14
1 files changed, 7 insertions, 7 deletions
diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk
index b88e2581f2..e5c738ac87 100755
--- a/sfx2/Module_sfx2.mk
+++ b/sfx2/Module_sfx2.mk
@@ -34,14 +34,14 @@ $(eval $(call gb_Module_add_targets,sfx2,\
Package_sdi \
))
-$(eval $(call gb_Module_add_check_targets,sfx2,\
- CppunitTest_sfx2_metadatable \
-))
+#$(eval $(call gb_Module_add_check_targets,sfx2,\
+# CppunitTest_sfx2_metadatable \
+#))
-$(eval $(call gb_Module_add_subsequentcheck_targets,sfx2,\
- JunitTest_sfx2_complex \
- JunitTest_sfx2_unoapi \
-))
+#$(eval $(call gb_Module_add_subsequentcheck_targets,sfx2,\
+# JunitTest_sfx2_complex \
+# JunitTest_sfx2_unoapi \
+#))
ifeq ($(OS),LINUX)
ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)