[Libreoffice] [PATCH][3-5] make building and installing of nsplugin more consistent

Hi,

I was now playing with nsplugin in master, so I created also patch for 3-5.

It was installed only in without mozilla case but compiled also in the
other case.
So now in master and in the patch nsplugin is only for with mozilla case.

But be aware that we don't need mozilla for this. (It was built also
in without mozilla case until now.)
Only headers from np_sdk.
And we also have --disable-nsplugin option.

So I'm not sure which makefile was right (scp2's or nsplugin'). I chose scp2.

Feel free to comment, push or ignore.

Matus

From 9241b5e7dcc2d72b30084f42c2c463ac7f4c381d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= <matus.kukan@gmail.com>
Date: Fri, 13 Jan 2012 16:02:03 +0100
Subject: [PATCH] make building and installing of nsplugin more consistent

---
 extensions/source/nsplugin/source/makefile.mk |    4 ++++
 scp2/source/ooo/common_brand.scp              |    2 +-
 scp2/source/ooo/file_ooo.scp                  |    2 +-
 scp2/source/ooo/makefile.mk                   |    4 ++++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/extensions/source/nsplugin/source/makefile.mk 
b/extensions/source/nsplugin/source/makefile.mk
index 5b74764..3d52234 100644
--- a/extensions/source/nsplugin/source/makefile.mk
+++ b/extensions/source/nsplugin/source/makefile.mk
@@ -36,6 +36,8 @@ USE_DEFFILE=TRUE
 
 .INCLUDE :     settings.mk
 
+.IF "$(WITH_MOZILLA)" != "NO"
+
 .IF "$(SYSTEM_MOZILLA_HEADERS)" == "YES"
 INCPRE+=$(MOZILLA_HEADERS_CFLAGS)
 .ELSE
@@ -158,6 +160,8 @@ DEF2EXPORTFILE=exports.dxp
 DEF2EXPORTFILE=exports_wnt.dxp
 .ENDIF
 
+.ENDIF # $(WITH_MOZILLA) != "NO"
+
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 04131ec..ed8f3b6 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -643,7 +643,7 @@ File gid_Brand_File_Bin_Libxml2
 End
 #endif
 
-#if !defined WITHOUT_MOZILLA && (!defined UNX || defined ENABLE_GTK)
+#if !defined WITHOUT_MOZILLA && defined ENABLE_NSPLUGIN
 File gid_Brand_File_Lib_Npsoplugin
     BIN_FILE_BODY;
     Name = SPECIAL_NAME(npsoplugin);
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a3dd222..7ad5a9d 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -110,7 +110,7 @@ End
 
 #ifndef WITHOUT_MOZILLA
 
-#if !defined(UNX) || defined(ENABLE_GTK)
+#ifdef ENABLE_NSPLUGIN
 File gid_File_Exe_Nsplugin
         BIN_FILE_BODY;
         Styles          = (PACKED);
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index be79403..112eed7 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -66,6 +66,10 @@ SCPDEFS+=-DENABLE_GTK3
 .ENDIF
 .ENDIF                 # "$(GUI)"=="UNX"
 
+.IF "$(ENABLE_NSPLUGIN)" == "YES"
+SCPDEFS+=-DENABLE_NSPLUGIN
+.ENDIF
+
 .IF "$(MERGELIBS)" == "TRUE"
 SCPDEFS+=-DMERGELIBS
 .ENDIF
-- 
1.7.1