From 1bf3fefd35990d0f7f9b35205b5d9f966624e53c Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Thu, 12 Jun 2003 10:07:29 +0000
Subject: INTEGRATION: CWS mh11rc (1.4.36); FILE MERGED 2003/06/06 10:08:53 mh
 1.4.36.1: join: from beta2

---
 automation/util/makefile.mk | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/automation/util/makefile.mk b/automation/util/makefile.mk
index d6584e5aa316..6f7eaaf4a6e4 100644
--- a/automation/util/makefile.mk
+++ b/automation/util/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.5 $
+#   $Revision: 1.6 $
 #
-#   last change: $Author: vg $ $Date: 2003-06-10 11:30:22 $
+#   last change: $Author: vg $ $Date: 2003-06-12 11:07:29 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -121,7 +121,16 @@ DEF1DES         =TestToolServer
 # --- TESTTOOL IDE ------------------------------------------------------
 
 APP1TARGET=testtool
+
+.IF "$(GUI)" == "UNX"
+APP1STDLIBS= -lapp -lsample
+.ELSE
 APP1STDLIBS= \
+        app.lib \
+        sample.lib
+.ENDIF
+    
+APP1STDLIBS+= \
             $(CPPUHELPERLIB) \
             $(TOOLSLIB) \
             $(UNOTOOLSLIB) \
@@ -166,14 +175,6 @@ APP1STDLIBS+= -lXext -lX11 -lSM -lICE
 APP1LIBS=\
         $(LIBPRE) $(LB)$/testtool.lib
 
-.IF "$(GUI)" == "UNX"
-APP1STDLIBS+= -lapp -lsample
-.ELSE
-APP1STDLIBS+= \
-        app.lib \
-        sample.lib
-.ENDIF
-    
 APP1DEPN=\
         $(LB)$/testtool.lib
 
-- 
cgit v1.2.3