summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authortono <tono@openoffice.org>2010-06-18 23:04:03 +0900
committertono <tono@openoffice.org>2010-06-18 23:04:03 +0900
commitb4a261de1d8eccac8fc0bd4711a0e9d48c6a5112 (patch)
tree9781f189b22c83defac53807c71e13412d24a55c /svtools
parent8412bc28b62534dd39eaa33b837c910d4cae08bf (diff)
parent8f6c75651a820fae86fc1e9976bfc67722579d2d (diff)
Merge backout
Diffstat (limited to 'svtools')
-rw-r--r--svtools/util/makefile.mk4
1 files changed, 0 insertions, 4 deletions
diff --git a/svtools/util/makefile.mk b/svtools/util/makefile.mk
index 9239b36cc6dc..ab05facdb065 100644
--- a/svtools/util/makefile.mk
+++ b/svtools/util/makefile.mk
@@ -153,11 +153,7 @@ DEF1DES =SvTools
APP2TARGET = g2g
APP2BASE = 0x10000000
-.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
APP2DEPN = $(SHL1TARGETN) $(SHL2TARGETN)
-.ELSE
-APP2DEPN = $(SHL1IMPLIBN) $(SHL2IMPLIBN)
-.ENDIF
APP2OBJS = $(OBJ)$/g2g.obj