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(-)
New commits: commit 98bc62b140a2692bef467452f000421e51b9a1f0 Author: Matúš Kukan <matus.ku...@gmail.com> Date: Fri Jan 13 16:02:03 2012 +0100 make building and installing of nsplugin more consistent 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 730de98..474d537 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -642,7 +642,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 8e18e8e..091415b 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
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits