diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-01-13 15:14:57 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-01-13 15:50:43 +0100 |
| commit | ab84770bb61ffb2675548e11a6a45059cb4f6c8e (patch) | |
| tree | d916717850680acce899a045334507e9ff136975 /Repository.mk | |
| parent | 4e85b537d1229348bef16bb006d9e6b5303bd6c9 (diff) | |
Build nsplugin only in with mozilla case.
This replaces commits 830a2b923528323e0f39259234dfee26d9d44d21
and 68b08a11babb7274048ef836a078959d126c97b7 with,
hopefully, proper one.
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Repository.mk b/Repository.mk index ac24a618c509..d781001334f6 100644 --- a/Repository.mk +++ b/Repository.mk @@ -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 \ |