INTEGRATION: CWS ooo20030412 (1.14.8.6.2.5.24); FILE MERGED

2003/04/01 15:36:27 mh 1.14.8.6.2.5.24.1: fix for parallel dmake, #i11673#
This commit is contained in:
Jens-Heiner Rechtien 2003-04-28 15:37:50 +00:00
parent da4f2b8ccf
commit b76e0bc754

View file

@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.30 $
# $Revision: 1.31 $
#
# last change: $Author: rt $ $Date: 2003-04-24 13:43:24 $
# last change: $Author: hr $ $Date: 2003-04-28 16:37:50 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -255,7 +255,7 @@ APP5OBJS += $(OBJ)$/icon_resource_ooo.obj
APP5STDLIBS+= -lXext -lSM -lICE
.ENDIF # LINUX
APP5DEPN= $(APP1RES) ooverinfo.rc
APP5DEPN= $(APP1TARGETN) $(APP5RES) ooverinfo.rc
APP5DEF= $(MISCX)$/$(TARGET).def
.IF "$(GUI)" == "WNT"
@ -295,4 +295,4 @@ $(MISCX)$/$(APP1TARGET).def : makefile.mk
$(BIN)$/so: makefile.mk
@echo APP5 : $(APP5TARGET)
@+-mkdir $(BIN)$/so
@+-mkdir $(BIN)$/so >& $(NULLDEV)