diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-25 12:57:59 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-25 12:57:59 +0000 |
| commit | 93509b64766766416a3c1a03e3666725adf98220 (patch) | |
| tree | cf7d9f58dc2377a7c7a658270ae22d59e6efc1fe /vos | |
| parent | 7a637ebfec3a101f413f7402b932bca3f17c4b5a (diff) | |
INTEGRATION: CWS ause069 (1.5.32); FILE MERGED
2006/11/28 13:08:55 hjs 1.5.32.2: #i70359# remove forced shell calls
2006/10/18 17:13:42 hjs 1.5.32.1: #i70359# remove forced shell calls
Diffstat (limited to 'vos')
| -rw-r--r-- | vos/util/makefile.mk | 55 |
1 files changed, 6 insertions, 49 deletions
diff --git a/vos/util/makefile.mk b/vos/util/makefile.mk index b5e97a4bb5df..31b1d53759e6 100644 --- a/vos/util/makefile.mk +++ b/vos/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: rt $ $Date: 2005-09-09 09:13:54 $ +# last change: $Author: obo $ $Date: 2007-01-25 13:57:59 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -50,30 +50,17 @@ TARGETTYPE=CUI # --- Settings ----------------------------------------------------- -.INCLUDE : svpre.mk .INCLUDE : settings.mk -.INCLUDE : sv.mk .INCLUDE : ..$/version.mk -.IF "$(depend)" == "" # --- Files -------------------------------------------------------- -.IF "$(header)" == "" - -#.IF "$(OS)"=="SOLARIS" -#LINKFLAGS+= -temp=/tmp -PIC -instances=extern -ptr$(SLO) -# -# erstmal raus. wer brauchts? -#CFLAGSSLO += -instances=extern -template=wholeclass -#CFLAGSOBJ += -instances=global -template=wholeclass +#.IF "$(UPDATER)"=="YES" +#LIB1TARGET=$(LB)$/a$(TARGET).lib +#LIB1ARCHIV=$(LB)$/lib$(TARGET)$(VOS_MAJOR)$(DLLPOSTFIX).a +#LIB1FILES=$(LB)$/cpp$(TARGET).lib #.ENDIF -.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) @@ -90,17 +77,12 @@ SHL1STDLIBS+= \ SHL1LIBS= $(SLB)$/cpp$(TARGET).lib -.IF "$(linkinc)" != "" -SHL1FILE=$(MISC)$/vos.slo - -.ELSE .IF "$(GUI)" != "UNX" .IF "$(GUI)" != "MAC" SHL1OBJS= \ $(SLO)$/object.obj .ENDIF .ENDIF -.ENDIF SHL1DEPN= SHL1DEF= $(MISC)$/$(SHL1TARGET).def @@ -111,13 +93,6 @@ DEFLIB1NAME =cppvos # --- Targets ------------------------------------------------------ -.ENDIF - -.IF "$(GUI)"=="WIN" -ALL: $(MISC)$/implib.cmd ALLTAR -.ENDIF - - .INCLUDE : target.mk $(MISC)$/$(SHL1TARGET).flt: @@ -133,23 +108,5 @@ $(MISC)$/$(SHL1TARGET).flt: @echo _TI1 >> $@ @echo exception::exception >> $@ @echo @std@ >> $@ -.IF "$(GUI)"!="OS2" -.IF "$(GUI)"!="MAC" @echo __>>$@ -.ENDIF -.ENDIF -$(MISC)$/implib.cmd: $(MISC)$/$(SHL1TARGET).def - @+-echo "/^name/d" > $@ - @+-echo "/^option/d" >> $@ - @+-echo "s/^export//g" >> $@ - @+-echo "s/^ /++/g" >> $@ - @+-echo "s/.*\./&vos$(UPD)wn./g" >> $@ - @+-sed -e s/\"//g $@ > $(MISC)$/tmp.sed - @+-sed -f $(MISC)$/tmp.sed $(MISC)$/$(SHL1TARGET).def > $(MISC)$/implib.lnk - @+-wlib -o $(LB)/ivos.lib @$(MISC)$/implib.lnk -.ELSE - -.INCLUDE : target.mk - -.ENDIF |