summaryrefslogtreecommitdiffstats
path: root/extensions/Module_extensions.mk
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2012-01-12 09:08:13 +0100
committerMatúš Kukan <matus.kukan@gmail.com>2012-01-12 17:44:08 +0100
commit830a2b923528323e0f39259234dfee26d9d44d21 (patch)
tree823745a207057b44de6eae8d874ddcd0f924b5be /extensions/Module_extensions.mk
parentfdo#41034 improve RTF import of table cell spacings (diff)
downloadcore-830a2b923528323e0f39259234dfee26d9d44d21.tar.gz
core-830a2b923528323e0f39259234dfee26d9d44d21.zip
use ENABLE_NSPLUGIN again
Diffstat (limited to 'extensions/Module_extensions.mk')
-rw-r--r--extensions/Module_extensions.mk23
1 files changed, 7 insertions, 16 deletions
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 9719f2b79305..a94eee6a6322 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -76,36 +76,27 @@ endif # DISABLE_ATL
endif # WNT
-ifneq ($(WITH_MOZILLA),NO)
-
+ifeq ($(ENABLE_NSPLUGIN),YES)
$(eval $(call gb_Module_add_targets,extensions,\
- Library_pl \
Executable_nsplugin \
+ Library_npsoplugin \
+ WinResTarget_npsoplugin \
))
-ifeq ($(GUI),WNT)
+endif
+
+ifeq ($(WITH_MOZILLA),YES)
$(eval $(call gb_Module_add_targets,extensions,\
- Library_npsoplugin \
- WinResTarget_npsoplugin \
+ Library_pl \
))
-endif # GUI=WNT
ifeq ($(GUI),UNX)
-
ifneq ($(GUIBASE),aqua)
-
$(eval $(call gb_Module_add_targets,extensions,\
Executable_pluginapp.bin \
))
endif # GUIBASE!=aqua
-
-ifneq ($(ENABLE_GTK),)
-$(eval $(call gb_Module_add_targets,extensions,\
- Library_npsoplugin \
-))
-endif # ENABLE_GTK
-
endif # GUI=UNX
endif # WITH_MOZILLA=YES