summaryrefslogtreecommitdiff
path: root/Repository.mk
diff options
context:
space:
mode:
Diffstat (limited to 'Repository.mk')
-rwxr-xr-xRepository.mk20
1 files changed, 9 insertions, 11 deletions
diff --git a/Repository.mk b/Repository.mk
index cc41b0631363..dd5a93c65067 100755
--- a/Repository.mk
+++ b/Repository.mk
@@ -190,24 +190,23 @@ $(eval $(call gb_Helper_register_executables,UREBIN,\
endif
-ifeq ($(ENABLE_NSPLUGIN),YES)
+ifeq ($(ENABLE_NPAPI_FROM_BROWSER),YES)
$(eval $(call gb_Helper_register_executables,OOO,\
- nsplugin \
+ pluginapp.bin \
))
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
- npsoplugin \
+$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
+ pl \
))
endif
-ifeq ($(WITH_MOZILLA),YES)
+ifeq ($(ENABLE_NPAPI_INTO_BROWSER),YES)
$(eval $(call gb_Helper_register_executables,OOO,\
- pluginapp.bin \
+ nsplugin \
))
-$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
- pl \
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+ npsoplugin \
))
-endif # WITH_MOZILLA
-
+endif
ifeq ($(OS),MACOSX)
@@ -290,7 +289,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
helplinker \
hwp \
hyphen \
- i18nregexp \
icd \
icg \
idx \