mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build nsplugin only in with mozilla case.

Browse Source 
This replaces commits 830a2b923528323e0f39259234dfee26d9d44d21
and 68b08a11babb7274048ef836a078959d126c97b7 with,
hopefully, proper one.
This commit is contained in:
Matúš Kukan 2012-01-13 15:14:57 +01:00
parent 4e85b537d1
commit ab84770bb6
3 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Repository.mk
View File

@ -101,13 +101,6 @@ endif
endif
ifeq ($(ENABLE_NSPLUGIN),YES)
$(eval $(call gb_Helper_register_executables,OOO,\
nsplugin \
))
endif
ifeq ($(WITH_MOZILLA),YES)
$(eval $(call gb_Helper_register_executables,OOO,\
pluginapp.bin \
@ -115,6 +108,14 @@ $(eval $(call gb_Helper_register_executables,OOO,\
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
pl \
))
ifeq ($(ENABLE_NSPLUGIN),YES)
$(eval $(call gb_Helper_register_executables,OOO,\
nsplugin \
))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
npsoplugin \
))
endif
endif # WITH_MOZILLA
@ -324,7 +325,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
log_uno \
mcnttype \
neon \
npsoplugin \
package2 \
reg \
scriptframe \

21
extensions/Module_extensions.mk
View File

@ -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

3
np_sdk/Module_np_sdk.mk
View File

@ -27,6 +27,8 @@
$(eval $(call gb_Module_Module,np_sdk))
ifeq ($(WITH_MOZILLA),YES)
$(eval $(call gb_Module_add_targets,np_sdk,\
Package_inc \
))
@ -35,6 +37,7 @@ ifeq ($(ENABLE_NSPLUGIN),YES)
$(eval $(call gb_Module_add_targets,np_sdk,\
StaticLibrary_nputils \
))
endif
endif