diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-03-15 07:52:14 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-03-15 07:52:14 +0000 |
| commit | 75005250bf50a995776461d330ca7e1eaadc8704 (patch) | |
| tree | 9805ef2acbc0098386f16c9a5fb4b25e79c69443 /tools | |
| parent | fd17843961a238e27c584de12035da0694938d53 (diff) | |
INTEGRATION: CWS bsport (1.19.32); FILE MERGED
2005/03/10 16:36:30 obo 1.19.32.2: #119707 small fix for unix
2005/02/16 13:55:01 obo 1.19.32.1: #119707# seperate library for prj.obj
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/bootstrp/makefile.mk | 45 |
1 files changed, 26 insertions, 19 deletions
diff --git a/tools/bootstrp/makefile.mk b/tools/bootstrp/makefile.mk index 61ce76b460ec..923b75bfabf3 100644 --- a/tools/bootstrp/makefile.mk +++ b/tools/bootstrp/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.19 $ +# $Revision: 1.20 $ # -# last change: $Author: hr $ $Date: 2004-12-10 18:04:51 $ +# last change: $Author: obo $ $Date: 2005-03-15 08:52:14 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -64,9 +64,9 @@ PRJ=.. PRJNAME=tools TARGET=bootstrp +TARGET1=bootstrp2 TARGETTYPE=CUI -#NO_DEFAULT_STL=TRUE - +LIBTARGET=NO # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk @@ -86,8 +86,8 @@ OBJFILES= \ $(OBJ)$/cppdep.obj\ $(OBJ)$/inimgr.obj\ $(OBJ)$/mkcreate.obj \ - $(OBJ)$/prj.obj \ - $(OBJ)$/sstring.obj + $(OBJ)$/sstring.obj \ + $(OBJ)$/prj.obj SLOFILES= \ $(SLO)$/appdef.obj \ @@ -95,26 +95,33 @@ SLOFILES= \ $(SLO)$/cppdep.obj \ $(SLO)$/inimgr.obj \ $(SLO)$/mkcreate.obj \ - $(SLO)$/prj.obj \ - $(SLO)$/sstring.obj + $(SLO)$/sstring.obj \ + $(SLO)$/prj.obj -LIB1TARGET= $(LB)$/btstrp.lib -LIB1ARCHIV= $(LB)$/libbtstrp.a -LIB1FILES= $(LB)$/bootstrp.lib -LIB2TARGET= $(SLB)$/btstrpsh.lib -LIB2ARCHIV= $(SLB)$/libbtstrpsh.a -LIB2FILES= $(SLB)$/bootstrp.lib +LIB1TARGET= $(LB)$/$(TARGET).lib +LIB1ARCHIV= $(LB)$/lib$(TARGET).a +LIB1OBJFILES=\ + $(OBJ)$/appdef.obj \ + $(OBJ)$/command.obj \ + $(OBJ)$/cppdep.obj \ + $(OBJ)$/inimgr.obj \ + $(OBJ)$/mkcreate.obj \ + $(OBJ)$/sstring.obj + +LIB2TARGET= $(LB)$/$(TARGET1).lib +LIB2ARCHIV= $(LB)$/lib$(TARGET1).a +LIB2OBJFILES=\ + $(OBJ)$/prj.obj APP1TARGET= sspretty -APP1OBJS= $(OBJ)$/sspretty.obj -APP1LIBS= $(LB)$/bootstrp.lib -APP1STDLIBS=$(STATIC_LIBS) -APP1STDLIBS= $(SALLIB) $(VOSLIB) $(TOOLSLIB) +APP1OBJS= $(OBJ)$/sspretty.obj +APP1LIBS= $(LB)$/$(TARGET).lib $(LB)$/$(TARGET1).lib +APP1STDLIBS=$(SALLIB) $(VOSLIB) $(TOOLSLIB) APP2TARGET= rscdep APP2OBJS= $(OBJ)$/rscdep.obj -APP2LIBS= $(LB)$/bootstrp.lib +APP2LIBS= $(LB)$/$(TARGET).lib $(LB)$/$(TARGET1).lib APP2STDLIBS= $(SALLIB) $(VOSLIB) $(TOOLSLIB) APP3TARGET= so_checksum |