diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-19 12:00:23 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-19 12:00:23 +0000 |
commit | f4e30879471b26b3d608b776b803f28338301c15 (patch) | |
tree | e90729477ffa8b59e4b8dc8226ccae60cf4590a2 /xmlhelp | |
parent | 7c59b5474b238dc831fa634027e52674f000b0c9 (diff) |
INTEGRATION: CWS ab38 (1.29.2); FILE MERGED
2007/11/06 15:45:12 ab 1.29.2.2: #i20164# Corrected building lib for UNIX
2007/11/06 12:04:55 ab 1.29.2.1: #i20164# Build helplinker library
Diffstat (limited to 'xmlhelp')
-rw-r--r-- | xmlhelp/source/com/sun/star/help/makefile.mk | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/xmlhelp/source/com/sun/star/help/makefile.mk b/xmlhelp/source/com/sun/star/help/makefile.mk index 19ed5fe64eed..58da72e0efd6 100644 --- a/xmlhelp/source/com/sun/star/help/makefile.mk +++ b/xmlhelp/source/com/sun/star/help/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.29 $ +# $Revision: 1.30 $ # -# last change: $Author: hr $ $Date: 2007-06-26 12:38:50 $ +# last change: $Author: ihi $ $Date: 2007-11-19 13:00:23 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -36,13 +36,14 @@ PRJ = ..$/..$/..$/..$/.. PRJNAME = xmlhelp TARGET = HelpLinker +LIBBASENAME = helplinker TARGETTYPE=CUI -LIBTARGET=no # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk - +.INCLUDE : helplinker.pmk + .IF "$(SYSTEM_LIBXSLT)" == "YES" CFLAGS+= $(LIBXSLT_CFLAGS) .ELSE @@ -57,10 +58,15 @@ CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES) OBJFILES=\ $(OBJ)$/HelpLinker.obj \ $(OBJ)$/HelpCompiler.obj +SLOFILES=\ + $(SLO)$/HelpLinker.obj \ + $(SLO)$/HelpCompiler.obj EXCEPTIONSFILES=\ $(OBJ)$/HelpLinker.obj \ - $(OBJ)$/HelpCompiler.obj + $(OBJ)$/HelpCompiler.obj \ + $(SLO)$/HelpLinker.obj \ + $(SLO)$/HelpCompiler.obj APP1TARGET= $(TARGET) @@ -70,6 +76,16 @@ APP1OBJS=\ APP1STDLIBS+=$(SALLIB) $(BERKELEYLIB) $(ICUUCLIB) $(XSLTLIB) +SHL1TARGET =$(LIBBASENAME)$(UPD)$(DLLPOSTFIX) +SHL1LIBS= $(SLB)$/$(TARGET).lib +SHL1IMPLIB =i$(LIBBASENAME) +SHL1DEF =$(MISC)$/$(SHL1TARGET).def +SHL1STDLIBS =$(SALLIB) $(BERKELEYLIB) $(ICUUCLIB) $(XSLTLIB) +SHL1USE_EXPORTS =ordinal + +DEF1NAME =$(SHL1TARGET) +DEFLIB1NAME =$(TARGET) + # --- Targets ------------------------------------------------------ .INCLUDE : target.mk |