diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-03-09 08:14:45 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-03-09 08:14:45 +0000 |
| commit | 23f142b202b35a8c868231ddc6de6f53a4efc9df (patch) | |
| tree | bb5fefe4e8bb0fd9a6f6c74b5101ceade3833968 /vos | |
| parent | 457c3c2e8bf4927f266737314982a59a19f90080 (diff) | |
INTEGRATION: CWS ause076 (1.6.4); FILE MERGED
2007/02/28 10:48:51 hjs 1.6.4.1: #i74812# cleanup *LIB and more
Diffstat (limited to 'vos')
| -rw-r--r-- | vos/util/makefile.mk | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/vos/util/makefile.mk b/vos/util/makefile.mk index 31b1d53759e6..456bd5df5a4a 100644 --- a/vos/util/makefile.mk +++ b/vos/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: obo $ $Date: 2007-01-25 13:57:59 $ +# last change: $Author: obo $ $Date: 2007-03-09 09:14:45 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -37,16 +37,9 @@ RTLLIB=irtl.lib PRJ=.. -PRJPCH= - PRJNAME=vos TARGET=vos -USE_LDUMP2=TRUE -#USE_DEFFILE=TRUE - -.IF "$(GUI)"=="UNX" TARGETTYPE=CUI -.ENDIF # --- Settings ----------------------------------------------------- @@ -55,12 +48,6 @@ TARGETTYPE=CUI # --- Files -------------------------------------------------------- -#.IF "$(UPDATER)"=="YES" -#LIB1TARGET=$(LB)$/a$(TARGET).lib -#LIB1ARCHIV=$(LB)$/lib$(TARGET)$(VOS_MAJOR)$(DLLPOSTFIX).a -#LIB1FILES=$(LB)$/cpp$(TARGET).lib -#.ENDIF - SHL1TARGET=$(VOS_TARGET)$(VOS_MAJOR)$(COMID) SHL1IMPLIB=i$(TARGET) @@ -70,19 +57,11 @@ SHL1STDLIBS=wsock32.lib $(SALLIB) SHL1STDLIBS=$(SALLIB) .ENDIF -.IF "$(GUI)"=="WIN" -SHL1STDLIBS+= \ - winsock.lib -.ENDIF - - SHL1LIBS= $(SLB)$/cpp$(TARGET).lib .IF "$(GUI)" != "UNX" -.IF "$(GUI)" != "MAC" SHL1OBJS= \ $(SLO)$/object.obj .ENDIF -.ENDIF SHL1DEPN= SHL1DEF= $(MISC)$/$(SHL1TARGET).def |