diff options
| author | tono <tono@openoffice.org> | 2010-06-18 22:49:15 +0900 |
|---|---|---|
| committer | tono <tono@openoffice.org> | 2010-06-18 22:49:15 +0900 |
| commit | 1db87dae03f3ad7dad86fa34dca6b3d46677ffe9 (patch) | |
| tree | 695b0f46ee65b71d3f90b6cb76b05ccfc141c754 /automation | |
| parent | d3b9e9e1d0a52dc8ae8485b7ec40bb6ce40d6f80 (diff) | |
Backed out changeset: f63af3433bcb
Diffstat (limited to 'automation')
| -rw-r--r-- | automation/util/makefile.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/automation/util/makefile.mk b/automation/util/makefile.mk index 6f1642658a5d..e683e73631b8 100644 --- a/automation/util/makefile.mk +++ b/automation/util/makefile.mk @@ -123,11 +123,7 @@ 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 = \ @@ -140,7 +136,7 @@ DEF3DES =Communication APP1TARGET=testtool -.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" +.IF "$(GUI)" == "UNX" APP1DEPN+=$(SHL2TARGETN) $(SHL3TARGETN) .ELSE APP1DEPN+=$(SHL2IMPLIBN) $(SHL3IMPLIBN) @@ -232,7 +228,7 @@ APP3STDLIBS+= \ .ENDIF .ENDIF # $(AUTOMATIONLIB) is build in SHL1TARGET -.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" +.IF "$(GUI)"=="UNX" APP3DEPN=$(SHL1TARGETN) .ELSE APP3DEPN=$(SHL1IMPLIBN) |