diff options
| author | tono <tono@openoffice.org> | 2010-06-18 23:04:03 +0900 |
|---|---|---|
| committer | tono <tono@openoffice.org> | 2010-06-18 23:04:03 +0900 |
| commit | b9d8770835a54aca6a59273c51b71f8a0240b72a (patch) | |
| tree | bc96a6f39c9b06a5c91fe12d158d0dc0cda12588 /automation | |
| parent | f8a00b408df923e4d6095a5093379b738537eb19 (diff) | |
| parent | 1db87dae03f3ad7dad86fa34dca6b3d46677ffe9 (diff) | |
Merge backout
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) |