diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-04-01 12:36:19 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-04-01 12:36:19 +0000 |
| commit | a339923fcdf9802bc2158c075ff4c0b4f3b42d28 (patch) | |
| tree | 4b41b7df7c66408eb7e77c605512b393b6caa833 /tools/bootstrp | |
| parent | 10b63568c6aa0276e1ad4eb80ba1c8dafe0c4c5f (diff) | |
INTEGRATION: CWS ause02 (1.10.12.2.4.2.16); FILE MERGED
2003/03/26 15:40:38 hjs 1.10.12.2.4.2.16.2: #107238# fixed APPnSTDLIBS
2003/03/10 18:14:23 hjs 1.10.12.2.4.2.16.1: #107238# remove static.mk
Diffstat (limited to 'tools/bootstrp')
| -rw-r--r-- | tools/bootstrp/makefile.mk | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/tools/bootstrp/makefile.mk b/tools/bootstrp/makefile.mk index 79cd8ac43718..9c9665b30d27 100644 --- a/tools/bootstrp/makefile.mk +++ b/tools/bootstrp/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.15 $ +# $Revision: 1.16 $ # -# last change: $Author: hr $ $Date: 2003-03-27 17:03:01 $ +# last change: $Author: vg $ $Date: 2003-04-01 13:36:19 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -69,10 +69,7 @@ NO_DEFAULT_STL=TRUE # --- Settings ----------------------------------------------------- -.INCLUDE : svpre.mk .INCLUDE : settings.mk -.INCLUDE : sv.mk -.INCLUDE : static.mk CDEFS+=-D_TOOLS_STRINGLIST @@ -110,21 +107,20 @@ LIB2FILES= $(SLB)$/bootstrp.lib APP1TARGET= i_server APP1STACK= 16000 APP1OBJS= $(OBJ)$/iserver.obj -APP1STDLIBS=$(STATIC_LIBS) APP1LIBS= $(LB)$/bootstrp.lib -APP1DEPN= $(LB)$/atools.lib $(LB)$/bootstrp.lib +APP1STDLIBS= $(SALLIB) $(TOOLSLIB) + APP6TARGET= sspretty APP6OBJS= $(OBJ)$/sspretty.obj APP6LIBS= $(LB)$/bootstrp.lib APP6STDLIBS=$(STATIC_LIBS) -APP6DEPN= $(LB)$/atools.lib $(LB)$/bootstrp.lib $(OBJ)$/sspretty.obj +APP6STDLIBS= $(SALLIB) $(TOOLSLIB) APP7TARGET= rscdep APP7OBJS= $(OBJ)$/rscdep.obj APP7LIBS= $(LB)$/bootstrp.lib -APP7STDLIBS=$(STATIC_LIBS) -APP7DEPN= $(LB)$/atools.lib $(LB)$/bootstrp.lib $(OBJ)$/rscdep.obj +APP7STDLIBS= $(SALLIB) $(VOSLIB) $(TOOLSLIB) DEPOBJFILES = $(APP1OBJS) $(APP2OBJS) $(APP3OBJS) $(APP4OBJS) $(APP5OBJS) $(APP6OBJS) |