diff options
| author | tono <tono@openoffice.org> | 2010-05-31 21:51:32 +0900 |
|---|---|---|
| committer | tono <tono@openoffice.org> | 2010-05-31 21:51:32 +0900 |
| commit | d3b9e9e1d0a52dc8ae8485b7ec40bb6ce40d6f80 (patch) | |
| tree | a7f164e57440f9815eef19a78838b510736e5fe9 /automation | |
| parent | aa9ff28ea9237d6098d59b7608f64111174a9cdd (diff) | |
i#111956: MinGW port fix: dependency to shared library
Diffstat (limited to 'automation')
| -rw-r--r-- | automation/util/makefile.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/automation/util/makefile.mk b/automation/util/makefile.mk index e683e73631b8..6f1642658a5d 100644 --- a/automation/util/makefile.mk +++ b/automation/util/makefile.mk @@ -123,7 +123,11 @@ SHL3STDLIBS+= \ SHL3DEF= $(MISC)$/$(SHL3TARGET).def SHL3LIBS= $(SLB)$/communi.lib +.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" SHL3DEPN=$(SHL2TARGETN) +.ELSE +SHL3DEPN=$(SHL2IMPLIBN) +.ENDIF DEF3NAME =$(SHL3TARGET) DEF3DEPN = \ @@ -136,7 +140,7 @@ DEF3DES =Communication APP1TARGET=testtool -.IF "$(GUI)" == "UNX" +.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" APP1DEPN+=$(SHL2TARGETN) $(SHL3TARGETN) .ELSE APP1DEPN+=$(SHL2IMPLIBN) $(SHL3IMPLIBN) @@ -228,7 +232,7 @@ APP3STDLIBS+= \ .ENDIF .ENDIF # $(AUTOMATIONLIB) is build in SHL1TARGET -.IF "$(GUI)"=="UNX" +.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" APP3DEPN=$(SHL1TARGETN) .ELSE APP3DEPN=$(SHL1IMPLIBN) |