diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-12-01 10:45:25 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-12-01 10:45:25 +0000 |
| commit | 29fe31e9fb75198cead9b5a8adb9c3ea62090744 (patch) | |
| tree | 135b179b959e6cb740b67600be869238d0c12717 /desktop/util | |
| parent | b76789e49c4012b77de3758f6f73a08695a1e89e (diff) | |
INTEGRATION: CWS geordi2q09 (1.34.6); FILE MERGED
2003/11/24 10:50:06 obo 1.34.6.1: #111934# join CWS pp1selectedfixes3
Diffstat (limited to 'desktop/util')
| -rw-r--r-- | desktop/util/makefile.mk | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index 8f5d7e889a12..7aec742d4cc5 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.34 $ +# $Revision: 1.35 $ # -# last change: $Author: hr $ $Date: 2003-11-07 14:54:20 $ +# last change: $Author: rt $ $Date: 2003-12-01 11:45:25 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -261,18 +261,24 @@ APP5LINKRES=$(MISC)$/ooffice.res .ENDIF # WNT +# --- Targets ------------------------------------------------------------- -all: $(BIN)$/so ALLTAR +.INCLUDE : target.mk +$(APP1TARGETN) : $(BIN)$/so + .IF "$(GUI)" == "WNT" - ALLTAR: $(BIN)$/$(TARGET).exe.manifest - .ENDIF # WNT -# --- Targets ------------------------------------------------------------- +$(BIN)$/soffice_oo$(EXECPOST) : $(APP5TARGETN) + +$(COPY) $< $@ + +$(BIN)$/so$/soffice_so$(EXECPOST) : $(APP1TARGETN) + +$(COPY) $< $@ -.INCLUDE : target.mk +ALLTAR : $(BIN)$/so$/soffice_so$(EXECPOST) $(BIN)$/soffice_oo$(EXECPOST) + .IF "$(GUI)" == "WNT" |