diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 23:27:47 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 23:27:47 +0000 |
commit | 125607736162faa3f60de419183b37f775b01548 (patch) | |
tree | 487d5ed1788ce43dc0acc35933e5a8957d7d79cc /automation/util/makefile.mk | |
parent | 5445757398aaec8754712e392284b2db7f19e7ca (diff) |
INTEGRATION: CWS warnings01 (1.20.4); FILE MERGED
2006/05/23 23:25:40 sb 1.20.4.3: RESYNC: (1.20-1.21); FILE MERGED
2006/05/22 15:22:10 sb 1.20.4.2: #i53898# Made code warning-free and/or compile at all after resync to SRC680m162.
2006/03/02 08:08:45 gh 1.20.4.1: removing warnings for linux and solarisSparc and some windows
Diffstat (limited to 'automation/util/makefile.mk')
-rw-r--r-- | automation/util/makefile.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/automation/util/makefile.mk b/automation/util/makefile.mk index 72206d5caaa5..580f9c97fd29 100644 --- a/automation/util/makefile.mk +++ b/automation/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.21 $ +# $Revision: 1.22 $ # -# last change: $Author: vg $ $Date: 2006-04-07 15:42:42 $ +# last change: $Author: hr $ $Date: 2006-06-20 00:27:47 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -35,7 +35,7 @@ PRJ=.. -PRJNAME=AUTOMATION +PRJNAME=automation TARGET=automation TARGETTYPE=GUI @@ -170,7 +170,6 @@ APP1STDLIBS+= \ $(SALLIB) \ $(SJLIB) \ $(VOSLIB) \ - $(SO2LIB) \ $(UCBHELPERLIB) \ $(COMPHELPERLIB) \ $(SOTLIB) \ @@ -235,8 +234,8 @@ APP3STDLIBS= \ $(TOOLSLIB) \ $(SVTOOLLIB) \ $(SVLIB) \ - $(SJLIB) \ - $(SO2LIB) + $(SJLIB) + .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" APP3STDLIBS+= \ |