#101685#,#i6886# merge OOO_STABLE_1_PORTS (1.4-1.4.16.1) -> HEAD

This commit is contained in:
Jens-Heiner Rechtien 2002-08-20 14:22:50 +00:00
parent 8bf63536c3
commit ed8297ae53

View file

@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.5 $
# $Revision: 1.6 $
#
# last change: $Author: pl $ $Date: 2002-08-02 12:10:15 $
# last change: $Author: hr $ $Date: 2002-08-20 15:22:50 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -71,12 +71,6 @@ TARGET=psp
# --- Allgemein ----------------------------------------------------------
.IF "$(OS)"=="MACOSX"
dummy:
@echo "Nothing to build for Mac OS X"
.ELSE # "$(OS)"=="MACOSX"
.IF "$(OS)"=="WNT"
LIB1TARGET= $(SLB)$/a$(TARGET).lib
LIB1FILES= $(SLB)$/fontsubset.lib
@ -108,7 +102,6 @@ SHL1STDLIBS=$(UNOTOOLSLIB) \
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(OS)"=="MACOSX"
# --- Targets ------------------------------------------------------------