diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-09 11:31:47 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-09 11:31:47 +0000 |
| commit | 5cc933d939e3134fb6333581cbdcf8000e4f12fd (patch) | |
| tree | b231d9f2188b7d4e0618262a4fad10fba968a3f5 /extensions | |
| parent | da91e0251219a8de4c6f55df5d1d8ff97ab3d4bc (diff) | |
INTEGRATION: CWS sb87 (1.18.180); FILE MERGED
2008/04/24 13:12:46 sb 1.18.180.2: RESYNC: (1.18-1.19); FILE MERGED
2008/04/04 11:53:49 sb 1.18.180.1: #i87548# moved npsoplugin dynamic library to brand layer, kept nsplugin executable (called from plugin, in turn calling soffice) in basis layer
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/nsplugin/source/makefile.mk | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/extensions/source/nsplugin/source/makefile.mk b/extensions/source/nsplugin/source/makefile.mk index b9ac920439c3..8288ed4ac67d 100644 --- a/extensions/source/nsplugin/source/makefile.mk +++ b/extensions/source/nsplugin/source/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.19 $ +# $Revision: 1.20 $ # # This file is part of OpenOffice.org. # @@ -81,6 +81,7 @@ SHL1STDLIBS+=$(SOLARLIBDIR)$/npunix.o #.ENDIF #FREEBSD .ENDIF #UNX .IF "$(GUI)"=="WNT" +SHL1OBJS+=$(SOLARLIBDIR)$/pathutils-slo.obj STDLIBS+=$(SOLARLIBDIR)$/npwin.obj SHL1STDLIBS+= $(SHELL32LIB) $(SOLARLIBDIR)$/npwin.obj @@ -93,33 +94,21 @@ OBJFILES=\ $(OBJ)$/so_main.obj # --- Plugin executable ------------------------- -.IF "$(OS)"=="SOLARIS" -LINKFLAGSAPP!:=$(LINKFLAGSAPP:s/-z defs/-z nodefs/) -.ENDIF # "$(OS)"=="SOLARIS" APP1TARGET=nsplugin$(EXEPOSTFIX) APP1OBJS=$(OBJFILES) APP1STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ - $(UNOTOOLSLIB) \ - $(COMPHELPERLIB) \ - $(VOSLIB) \ - $(SALLIB) \ - $(VCLLIB) \ - $(SVLLIB) \ - $(TOOLSLIB) + $(SALLIB) -.IF "$(GUI)"=="UNX" -.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX" -.ELSE -APP1STDLIBS+= -ldl -lnsl -lnls -lsocket -.ENDIF +.IF "$(OS)"=="SOLARIS" +APP1STDLIBS+= -lsocket -lnsl .ENDIF .IF "$(GUI)"=="WNT" DEPOBJFILES=$(OBJ)$/nsp_windows.obj -APP1OBJS+=$(OBJ)$/nsp_windows.obj +APP1OBJS+=$(OBJ)$/nsp_windows.obj $(SOLARLIBDIR)$/pathutils-obj.obj APP1STDLIBS+= $(WS2_32LIB) $(SHELL32LIB) $(OLE32LIB) $(KERNEL32LIB) $(USER32LIB) $(GDI32LIB) $(WINSPOOLLIB) $(COMDLG32LIB) $(ADVAPI32LIB) $(OLEAAUT32LIB) $(UUIDLIB) .ENDIF @@ -133,6 +122,7 @@ SHL1STDLIBS+= $(WS2_32LIB) $(SHELL32LIB) $(OLE32LIB) $(KERNEL32LIB) $(USER32LIB) SHL1DEPN= SHL1IMPLIB= i$(SHL1TARGET) SHL1DEF= $(MISC)$/$(SHL1TARGET).def +SHL1RPATH=BRAND # ----- get some additional keys in versioninfo ------------ SHL1ADD_VERINFO=nsplugin.rc @@ -156,6 +146,7 @@ SHL2STDLIBS+= $(WS2_32LIB) $(SHELL32LIB) $(OLE32LIB) $(KERNEL32LIB) $(USER32LIB) SHL2DEPN= SHL2IMPLIB= i$(SHL2TARGET) SHL2DEF= $(MISC)$/$(SHL2TARGET).def +SHL2RPATH=BRAND # ----- get some additional keys in versioninfo ------------ SHL2ADD_VERINFO=nsplugin_oo.rc |