[Libreoffice-commits] .: extensions/Module_extensions.mk np_sdk/Module_np_sdk.mk Repository.mk

2012-01-13 Thread Matus Kukan 
 Repository.mk   |   16 
 extensions/Module_extensions.mk |   21 ++---
 np_sdk/Module_np_sdk.mk |3 +++
 3 files changed, 21 insertions(+), 19 deletions(-)

New commits:
commit ab84770bb61ffb2675548e11a6a45059cb4f6c8e
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Fri Jan 13 15:14:57 2012 +0100

Build nsplugin only in with mozilla case.

This replaces commits 830a2b923528323e0f39259234dfee26d9d44d21
and 68b08a11babb7274048ef836a078959d126c97b7 with,
hopefully, proper one.

diff --git a/Repository.mk b/Repository.mk
index ac24a61..d781001 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 \
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index a94eee6..1010e63 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
 
diff --git a/np_sdk/Module_np_sdk.mk b/np_sdk/Module_np_sdk.mk
index 6c658d2..63393d5 100644
--- a/np_sdk/Module_np_sdk.mk
+++ b/np_sdk/Module_np_sdk.mk
@@ -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
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: extensions/Module_extensions.mk np_sdk/Module_np_sdk.mk

2012-01-12 Thread Matus Kukan 
 extensions/Module_extensions.mk |   23 +++
 np_sdk/Module_np_sdk.mk |5 -
 2 files changed, 11 insertions(+), 17 deletions(-)

New commits:
commit 830a2b923528323e0f39259234dfee26d9d44d21
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Thu Jan 12 09:08:13 2012 +0100

use ENABLE_NSPLUGIN again

diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 9719f2b..a94eee6 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -76,36 +76,27 @@ endif # DISABLE_ATL
 
 endif # WNT
 
-ifneq ($(WITH_MOZILLA),NO)
-
+ifeq ($(ENABLE_NSPLUGIN),YES)
 $(eval $(call gb_Module_add_targets,extensions,\
-   Library_pl \
Executable_nsplugin \
+   Library_npsoplugin \
+   WinResTarget_npsoplugin \
 ))
 
-ifeq ($(GUI),WNT)
+endif
+
+ifeq ($(WITH_MOZILLA),YES)
 $(eval $(call gb_Module_add_targets,extensions,\
-   Library_npsoplugin \
-   WinResTarget_npsoplugin \
+   Library_pl \
 ))
-endif # GUI=WNT
 
 ifeq ($(GUI),UNX)
-
 ifneq ($(GUIBASE),aqua)
-
 $(eval $(call gb_Module_add_targets,extensions,\
Executable_pluginapp.bin \
 ))
 
 endif # GUIBASE!=aqua
-
-ifneq ($(ENABLE_GTK),)
-$(eval $(call gb_Module_add_targets,extensions,\
-   Library_npsoplugin \
-))
-endif # ENABLE_GTK
-
 endif # GUI=UNX
 
 endif # WITH_MOZILLA=YES
diff --git a/np_sdk/Module_np_sdk.mk b/np_sdk/Module_np_sdk.mk
index bda8126..6c658d2 100644
--- a/np_sdk/Module_np_sdk.mk
+++ b/np_sdk/Module_np_sdk.mk
@@ -27,9 +27,12 @@
 
 $(eval $(call gb_Module_Module,np_sdk))
 
-ifeq ($(WITH_MOZILLA),YES)
 $(eval $(call gb_Module_add_targets,np_sdk,\
Package_inc \
+))
+
+ifeq ($(ENABLE_NSPLUGIN),YES)
+$(eval $(call gb_Module_add_targets,np_sdk,\
StaticLibrary_nputils \
 ))
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits