diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-06-12 10:07:29 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-06-12 10:07:29 +0000 |
| commit | 536fc0fca9e6606dd13b38e82dd00e5da4d7ddd7 (patch) | |
| tree | 81f88a355caa091a2f6554a13a674d7220daf883 /automation/util | |
| parent | 3e8ad69b7f0fac4ca920e2272c7952479b00c43f (diff) | |
INTEGRATION: CWS mh11rc (1.4.36); FILE MERGED
2003/06/06 10:08:53 mh 1.4.36.1: join: from beta2
Diffstat (limited to 'automation/util')
| -rw-r--r-- | automation/util/makefile.mk | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/automation/util/makefile.mk b/automation/util/makefile.mk index d6584e5aa..6f7eaaf4a 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 |