diff options
| author | Malte Timmermann [mt] <malte.timmermann@sun.com> | 2010-07-02 13:17:39 +0200 |
|---|---|---|
| committer | Malte Timmermann [mt] <malte.timmermann@sun.com> | 2010-07-02 13:17:39 +0200 |
| commit | c57d83d4b620a95fd831cf1b828eb87239467761 (patch) | |
| tree | b9f6376d81a71b5e474baa2205fac26df23b5de5 /automation | |
| parent | 9796d18817669f28ff8c465050469ef729968486 (diff) | |
| parent | 273fa6a6aa0d56660807ab29892f0618cfbb2e63 (diff) | |
codecleanup02: merge with DEV300_m84
Diffstat (limited to 'automation')
| -rw-r--r-- | automation/util/makefile.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/automation/util/makefile.mk b/automation/util/makefile.mk index e683e73631b8..756a3d6a62e4 100644 --- a/automation/util/makefile.mk +++ b/automation/util/makefile.mk @@ -136,7 +136,7 @@ DEF3DES =Communication APP1TARGET=testtool -.IF "$(GUI)" == "UNX" +.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT") APP1DEPN+=$(SHL2TARGETN) $(SHL3TARGETN) .ELSE APP1DEPN+=$(SHL2IMPLIBN) $(SHL3IMPLIBN) @@ -228,7 +228,7 @@ APP3STDLIBS+= \ .ENDIF .ENDIF # $(AUTOMATIONLIB) is build in SHL1TARGET -.IF "$(GUI)"=="UNX" +.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT") APP3DEPN=$(SHL1TARGETN) .ELSE APP3DEPN=$(SHL1IMPLIBN) |