summaryrefslogtreecommitdiff
path: root/sfx2/util
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2003-04-15 12:43:34 +0000
committerVladimir Glazounov <vg@openoffice.org>2003-04-15 12:43:34 +0000
commit8fee8b37c47171619c2ecb1ccbc45cfa73f285a4 (patch)
treef828ecaf409ec3932c5e439c939617d1014ec114 /sfx2/util
parent59e492b1a89e5874098357f0a8c10e594248cba0 (diff)
INTEGRATION: CWS tune01 (1.21.8.8.2.1.54); FILE MERGED
2003/03/28 18:03:33 mhu 1.21.8.8.2.1.54.1: #108383# Removed excess shared library dependencies.
Diffstat (limited to 'sfx2/util')
-rw-r--r--sfx2/util/makefile.mk47
1 files changed, 17 insertions, 30 deletions
diff --git a/sfx2/util/makefile.mk b/sfx2/util/makefile.mk
index 984e9f1818..904ce42d1d 100644
--- a/sfx2/util/makefile.mk
+++ b/sfx2/util/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.28 $
+# $Revision: 1.29 $
#
-# last change: $Author: hr $ $Date: 2003-03-27 11:29:34 $
+# last change: $Author: vg $ $Date: 2003-04-15 13:43:34 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -105,43 +105,30 @@ SHL1TARGET= sfx$(UPD)$(DLLPOSTFIX)
SHL1IMPLIB= isfx
SHL1STDLIBS+=\
- $(FWELIB) \
+ $(FWELIB) \
$(BASICLIB) \
- $(VOSLIB) \
- $(SALLIB) \
- $(SALHELPERLIB) \
- $(CHANELLIB) \
+ $(XMLOFFLIB) \
+ $(XMLSCRIPTLIB) \
$(SO2LIB) \
- $(INETLIBSH) \
+ $(SOTLIB) \
$(SVTOOLLIB) \
- $(SVLLIB) \
- $(SVLIB) \
- $(TOOLSLIB) \
- $(HELPLIB) \
- $(SVMEMLIB) \
- $(GOODIESLIB) \
$(TKLIB) \
- $(SOTLIB) \
- $(RTLLIB) \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
+ $(VCLLIB) \
+ $(SVLLIB) \
$(UNOTOOLSLIB) \
- $(UCBHELPERLIB) \
+ $(TOOLSLIB) \
+ $(SYSSHELLLIB) \
$(COMPHELPERLIB) \
- $(XMLOFFLIB) \
- $(XMLSCRIPTLIB) \
- $(SYSSHELLLIB)
-
-# [ed] 6/17/02 Add in another library
-
-.IF "$(OS)"=="MACOSX"
-SHL1STDLIBS += $(INETLIB)
-.ENDIF
+ $(UCBHELPERLIB) \
+ $(CPPUHELPERLIB) \
+ $(CPPULIB) \
+ $(VOSLIB) \
+ $(SALLIB)
.IF "$(SOLAR_JAVA)" != ""
SHL1STDLIBS+=\
$(SJLIB)
-.ENDIF
+.ENDIF # SOLAR_JAVA
.IF "$(GUI)"=="WNT"
@@ -153,7 +140,7 @@ SHL1STDLIBS+=\
ole32.lib \
uuid.lib
-.ENDIF
+.ENDIF # WNT
.IF "$(GUI)"!="MAC"