summaryrefslogtreecommitdiff
path: root/extensions/source
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2003-04-15 12:55:01 +0000
committerVladimir Glazounov <vg@openoffice.org>2003-04-15 12:55:01 +0000
commit4012f2418a246307cd92ff09d8288caf411dc275 (patch)
treead3bcbf1126cb62d834a751cd6fb696b12249be7 /extensions/source
parent7f5e256adad344fda4aa942ee2206a15be3aab76 (diff)
INTEGRATION: CWS tune01 (1.6.46); FILE MERGED
2003/03/14 11:31:52 mhu 1.6.46.1: #i12151# Added symbol scoping mapfile, fixed dependencies, removed obsolete files.
Diffstat (limited to 'extensions/source')
-rw-r--r--extensions/source/plugin/util/makefile.mk46
1 files changed, 22 insertions, 24 deletions
diff --git a/extensions/source/plugin/util/makefile.mk b/extensions/source/plugin/util/makefile.mk
index 3da4e2a650c2..a401f8b44266 100644
--- a/extensions/source/plugin/util/makefile.mk
+++ b/extensions/source/plugin/util/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.6 $
+# $Revision: 1.7 $
#
-# last change: $Author: gh $ $Date: 2002-11-07 15:14:04 $
+# last change: $Author: vg $ $Date: 2003-04-15 13:55:01 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -64,7 +64,6 @@ PRJ=..$/..$/..
PRJNAME=extensions
TARGET=pl
TARGETTYPE=GUI
-USE_DEFFILE=TRUE
# --- Settings -----------------------------------------------------
@@ -77,46 +76,45 @@ LIB1FILES = \
$(SLB)$/plbase.lib \
$(SHL1LINKLIB)
-SHL1TARGET= $(TARGET)$(UPD)$(DLLPOSTFIX)
-
.IF "$(GUI)" == "UNX"
SHL1LINKLIB = $(SLB)$/plunx.lib
-.ENDIF
+.IF "$(OS)" == "SOLARIS"
+SHL1OWNLIBS = -lsocket
+.ENDIF # SOLARIS
+.ENDIF # UNX
.IF "$(GUI)" == "WNT"
SHL1LINKLIB = $(SLB)$/plwin.lib
-SHL1OWNLIB = \
+SHL1OWNLIBS = \
version.lib \
ole32.lib \
advapi32.lib
-.ENDIF
+.ENDIF # WNT
.IF "$(GUI)" == "OS2"
SHL1LINKLIB = $(SLB)$/plos2.lib
-.ENDIF
+.ENDIF # OS2
-SHL1STDLIBS=\
- $(SHL1OWNLIB) \
- $(SVTOOLLIB) \
- $(SVLLIB) \
+SHL1TARGET= $(TARGET)$(UPD)$(DLLPOSTFIX)
+SHL1IMPLIB= i$(TARGET)
+
+SHL1VERSIONMAP=exports.map
+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+DEF1NAME=$(SHL1TARGET)
+
+SHL1LIBS=$(LIB1TARGET)
+SHL1STDLIBS= \
+ $(TKLIB) \
$(VCLLIB) \
+ $(SVLLIB) \
$(TOOLSLIB) \
- $(UCBHELPERLIB) \
- $(TKLIB) \
$(VOSLIB) \
+ $(UCBHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
$(SALLIB)
-#SHL1DEPN= $(SLB)/sfx.lib $(L)$/itools.lib $(L)$/ivcl.lib
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-SHL1IMPLIB = i$(TARGET)
-
-SHL1LIBS = $(LIB1TARGET)
-
-
-DEF1NAME =$(SHL1TARGET)
-DEF1EXPORTFILE= exports.dxp
+SHL1STDLIBS+=$(SHL1OWNLIBS)
# --- Targets ------------------------------------------------------