diff options
| author | Mikhail Voitenko <mav@openoffice.org> | 2009-11-05 16:05:18 +0000 |
|---|---|---|
| committer | Mikhail Voitenko <mav@openoffice.org> | 2009-11-05 16:05:18 +0000 |
| commit | a976c11bec7da351774b2a08de6a13ee32ea5c6b (patch) | |
| tree | 3a93023cc69a93f55b2032dc82743fbd967b3dd6 /desktop/util | |
| parent | #i10000# separate SO build for windows (diff) | |
| download | core-a976c11bec7da351774b2a08de6a13ee32ea5c6b.tar.gz core-a976c11bec7da351774b2a08de6a13ee32ea5c6b.zip | |
#i106536# Integrate the patch from hjs
Diffstat (limited to 'desktop/util')
| -rw-r--r-- | desktop/util/makefile.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index 4dec3cd738ba..78305523c493 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -287,22 +287,25 @@ $(BIN)$/soffice_oo$(EXECPOST) : $(APP5TARGETN) $(BIN)$/so$/soffice_so$(EXECPOST) : $(APP1TARGETN) $(COPY) $< $@ -ALLTAR : $(BIN)$/so$/soffice_so$(EXECPOST) $(BIN)$/soffice_oo$(EXECPOST) -.ELSE -ALLTAR : $(BIN)$/soffice_oo$(EXECPOST) +ALLTAR : $(BIN)$/so$/soffice_so$(EXECPOST) .ENDIF # "$(LINK_SO)"=="TRUE" +ALLTAR : $(BIN)$/soffice_oo$(EXECPOST) .ENDIF .IF "$(OS)" == "MACOSX" +.IF "$(LINK_SO)"=="TRUE" $(BIN)$/so$/soffice_mac$(EXECPOST) : $(APP1TARGETN) $(COPY) $< $@ +ALLTAR : $(BIN)$/so$/soffice_mac$(EXECPOST) +.ENDIF # "$(LINK_SO)"=="TRUE" + $(BIN)$/soffice_mac$(EXECPOST) : $(APP5TARGETN) $(COPY) $< $@ -ALLTAR : $(BIN)$/so$/soffice_mac$(EXECPOST) $(BIN)$/soffice_mac$(EXECPOST) +ALLTAR : $(BIN)$/soffice_mac$(EXECPOST) -.ENDIF +.ENDIF # "$(OS)" == "MACOSX" .IF "$(GUI)" == "WNT" |