summaryrefslogtreecommitdiff
path: root/sj2
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2003-04-15 12:43:54 +0000
committerVladimir Glazounov <vg@openoffice.org>2003-04-15 12:43:54 +0000
commit78a9a6286bd5f097d28b9321ea88951248dd147b (patch)
tree14c8db207e029770709d417505254ce3b275128e /sj2
parent8fee8b37c47171619c2ecb1ccbc45cfa73f285a4 (diff)
INTEGRATION: CWS tune01 (1.5.40); FILE MERGED
2003/04/02 19:31:13 mhu 1.5.40.1: #108383# Removed excess shared library dependencies.
Diffstat (limited to 'sj2')
-rw-r--r--sj2/util/makefile.mk23
1 files changed, 5 insertions, 18 deletions
diff --git a/sj2/util/makefile.mk b/sj2/util/makefile.mk
index 770a6621e0..26856f78fb 100644
--- a/sj2/util/makefile.mk
+++ b/sj2/util/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.5 $
+# $Revision: 1.6 $
#
-# last change: $Author: pl $ $Date: 2001-10-24 16:25:03 $
+# last change: $Author: vg $ $Date: 2003-04-15 13:43:54 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -83,24 +83,11 @@ SHL1TARGET= j$(UPD)$(DLLPOSTFIX)_g
SHL1IMPLIB= $(TARGET)
SHL1STDLIBS= \
- $(SVTOOLLIB) \
- $(SVLLIB) \
- $(TKLIB) \
- $(VCLLIB)
-
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"!="MACOSX"
-SHL1STDLIBS+=-lX11
-.ENDIF
-.ENDIF
-
-SHL1STDLIBS+=\
+ $(VCLLIB) \
+ $(UNOTOOLSLIB) \
$(TOOLSLIB) \
- $(VOSLIB) \
- $(SALLIB) \
- $(RTLLIB) \
$(CPPULIB) \
- $(UNOTOOLSLIB)
+ $(SALLIB)
SHL1LIBS= $(SLB)$/$(TARGET).lib
SHL1DEF= $(MISC)$/$(SHL1TARGET).def