summaryrefslogtreecommitdiff
path: root/extensions/Module_extensions.mk
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2012-01-13 15:14:57 +0100
committerMatúš Kukan <matus.kukan@gmail.com>2012-01-13 15:50:43 +0100
commitab84770bb61ffb2675548e11a6a45059cb4f6c8e (patch)
treed916717850680acce899a045334507e9ff136975 /extensions/Module_extensions.mk
parent4e85b537d1229348bef16bb006d9e6b5303bd6c9 (diff)
Build nsplugin only in with mozilla case.
This replaces commits 830a2b923528323e0f39259234dfee26d9d44d21 and 68b08a11babb7274048ef836a078959d126c97b7 with, hopefully, proper one.
Diffstat (limited to 'extensions/Module_extensions.mk')
-rw-r--r--extensions/Module_extensions.mk21
1 files changed, 10 insertions, 11 deletions
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index a94eee6a6322..1010e63524a0 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -76,16 +76,8 @@ endif # DISABLE_ATL
endif # WNT
-ifeq ($(ENABLE_NSPLUGIN),YES)
-$(eval $(call gb_Module_add_targets,extensions,\
- Executable_nsplugin \
- Library_npsoplugin \
- WinResTarget_npsoplugin \
-))
-
-endif
-
ifeq ($(WITH_MOZILLA),YES)
+
$(eval $(call gb_Module_add_targets,extensions,\
Library_pl \
))
@@ -95,9 +87,16 @@ ifneq ($(GUIBASE),aqua)
$(eval $(call gb_Module_add_targets,extensions,\
Executable_pluginapp.bin \
))
+endif
+endif
-endif # GUIBASE!=aqua
-endif # GUI=UNX
+ifeq ($(ENABLE_NSPLUGIN),YES)
+$(eval $(call gb_Module_add_targets,extensions,\
+ Executable_nsplugin \
+ Library_npsoplugin \
+ WinResTarget_npsoplugin \
+))
+endif
endif # WITH_MOZILLA=YES