summaryrefslogtreecommitdiffstats
path: root/writerperfect/Module_writerperfect.mk
diff options
context:
space:
mode:
Diffstat (limited to 'writerperfect/Module_writerperfect.mk')
-rw-r--r--writerperfect/Module_writerperfect.mk26
1 files changed, 8 insertions, 18 deletions
diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk
index dc2039c8f604..0e1bee0f2188 100644
--- a/writerperfect/Module_writerperfect.mk
+++ b/writerperfect/Module_writerperfect.mk
@@ -28,42 +28,32 @@
$(eval $(call gb_Module_Module,writerperfect))
-ifneq (,$(filter YES,$(SYSTEM_LIBCDR))$(filter LIBCDR,$(BUILD_TYPE)))
-$(eval $(call gb_Module_add_targets,writerperfect,\
- Library_cdrimport \
-))
-endif
-
ifneq (,$(filter YES,$(SYSTEM_LIBWPD))$(filter LIBWPD,$(BUILD_TYPE)))
ifneq (,$(filter YES,$(SYSTEM_LIBWPS))$(filter LIBWPS,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,writerperfect,\
- Library_msworks \
+ Library_wpftwriter \
))
endif
endif
+ifneq (,$(filter YES,$(SYSTEM_LIBWPD))$(filter LIBWPD,$(BUILD_TYPE)))
+ifneq (,$(filter YES,$(SYSTEM_LIBWPG))$(filter LIBWPG,$(BUILD_TYPE)))
ifneq (,$(filter YES,$(SYSTEM_LIBVISIO))$(filter LIBVISIO,$(BUILD_TYPE)))
+ifneq (,$(filter YES,$(SYSTEM_LIBCDR))$(filter LIBCDR,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,writerperfect,\
- Library_visioimport \
+ Library_wpftdraw \
))
endif
-
-ifneq (,$(filter YES,$(SYSTEM_LIBWPD))$(filter LIBWPD,$(BUILD_TYPE)))
-$(eval $(call gb_Module_add_targets,writerperfect,\
- Library_wpft \
-))
endif
-
-ifneq (,$(filter YES,$(SYSTEM_LIBWPG))$(filter LIBWPG,$(BUILD_TYPE)))
-$(eval $(call gb_Module_add_targets,writerperfect,\
- Library_wpgimport \
-))
+endif
endif
ifneq (,$(filter YES,$(SYSTEM_LIBWPD))$(filter LIBWPD,$(BUILD_TYPE)))
+ifneq (,$(filter YES,$(SYSTEM_LIBWPG))$(filter LIBWPG,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,writerperfect,\
StaticLibrary_writerperfect \
))
endif
+endif
# vim: set noet sw=4 ts=4: