diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-06-10 10:30:22 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-06-10 10:30:22 +0000 |
| commit | 5cc19bab9141ccef13b7f42ef57846e4b7ae05bd (patch) | |
| tree | c249d3019649d8e0d9f340c88e3fd30c45867c90 /automation/util/makefile.mk | |
| parent | 65a64dccc796b61a789f7bc5f2e83f2e8df1775a (diff) | |
INTEGRATION: CWS gh4 (1.4.30); FILE MERGED
2003/06/06 13:57:33 hjs 1.4.30.1: #i15353# added dependencies
Diffstat (limited to 'automation/util/makefile.mk')
| -rw-r--r-- | automation/util/makefile.mk | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/automation/util/makefile.mk b/automation/util/makefile.mk index b8e820a9ed97..d6584e5aa316 100644 --- a/automation/util/makefile.mk +++ b/automation/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: gh $ $Date: 2002-11-20 14:11:48 $ +# last change: $Author: vg $ $Date: 2003-06-10 11:30:22 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -79,7 +79,7 @@ LIB1FILES= \ $(SLB)$/server.lib SHL1TARGET= sts$(UPD)$(DLLPOSTFIX) -SHL1IMPLIB= $(TARGET) +SHL1IMPLIB= ists SHL1STDLIBS= \ $(TOOLSLIB) \ @@ -108,9 +108,6 @@ SHL1STDLIBS+=$(LIBCIMT) \ $(LIBPRE) gdi32.lib .ENDIF -#SHL1DEPN= $(L)$/itools.lib $(SVLIBDEPEND) $(L)$/so2.lib $(L)$/svtool.lib - - SHL1DEF= $(MISC)$/$(SHL1TARGET).def SHL1LIBS= $(SLB)$/$(TARGET).lib @@ -178,9 +175,7 @@ APP1STDLIBS+= \ .ENDIF APP1DEPN=\ - $(L)$/itools.lib \ - $(SVLIBDEPEND) \ - $(LB)$/testtool.lib \ + $(LB)$/testtool.lib APP1OBJS= $(OBJ)$/testbasi.obj \ $(OBJ)$/cmdbasestream.obj \ @@ -212,13 +207,11 @@ APP3STDLIBS+= \ $(VOSLIB) $(SALLIB) .ENDIF - APP3LIBS= \ $(LIBPRE) $(LB)$/miniapp.lib APP3DEPN=\ - $(L)$/itools.lib \ - $(SVLIBDEPEND) \ + $(SHL1TARGETN) \ $(LB)$/miniapp.lib .IF "$(GUI)" != "UNX" @@ -228,9 +221,7 @@ APP3OBJS= $(OBJ)$/testapp.obj # --- Targets ----------------------------------------------------------- -ALL: $(LIB1TARGET) \ - ALLTAR - +.INCLUDE : target.mk # --- Basic-Filter-Datei --- @@ -247,5 +238,3 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk # ------------------------------------------------------------------------ -.INCLUDE : target.mk - |