summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-11-19 17:41:01 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-11-19 17:41:01 +0100
commitf9059d4eee8e53c0a6b531fff16e1fade58cb8b0 (patch)
tree47d4d29b51a96958d5aa0653dc3368e3d1be20e1 /extensions
parentb479f7f7675b8a539b35faaa6edcd282e09bba97 (diff)
Key all browser plugin features to --enable-nsplugin
...instead of having them spread across --enable-nsplugin (plug LO into browser windows) and --enable-mozilla (plug browser plugins into LO documents). The ultimate goal is to clean up the various configure options mentioning "mozilla" and WITH_MOZILLA. Change-Id: I6f4b1c3a5701424f586cc1e303af90c9d59a91b6
Diffstat (limited to 'extensions')
-rw-r--r--extensions/Module_extensions.mk11
1 files changed, 3 insertions, 8 deletions
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 67133d0df8cc..99ec13f0875f 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -104,19 +104,14 @@ endif # DISABLE_ATL
endif # WNT
ifeq ($(ENABLE_NSPLUGIN),YES)
+
$(eval $(call gb_Module_add_targets,extensions,\
Executable_nsplugin \
Library_npsoplugin \
+ Library_pl \
StaticLibrary_npsoenv \
WinResTarget_npsoplugin \
))
-endif
-
-ifeq ($(WITH_MOZILLA),YES)
-
-$(eval $(call gb_Module_add_targets,extensions,\
- Library_pl \
-))
ifeq ($(GUI),UNX)
ifneq ($(GUIBASE),aqua)
@@ -127,7 +122,7 @@ $(eval $(call gb_Module_add_targets,extensions,\
endif
endif
-endif # WITH_MOZILLA=YES
+endif # ENABLE_PLUGIN=YES
ifeq ($(OS),MACOSX)
$(eval $(call gb_Module_add_targets,extensions,\