summaryrefslogtreecommitdiff
path: root/salhelper/source/makefile.mk
diff options
context:
space:
mode:
authorJuergen Schmidt <jsc@openoffice.org>2001-05-04 12:24:41 +0000
committerJuergen Schmidt <jsc@openoffice.org>2001-05-04 12:24:41 +0000
commit2caa74b4f96e0eb6c22ebb65301d682063e5f042 (patch)
tree9cfecc3f45692ee78ef19ba4b1a13b7686e94881 /salhelper/source/makefile.mk
parent366b7dc2bdc54df492cfa50a760208771788f39d (diff)
remove version.mk and insert usage of UDK_MAJOR
Diffstat (limited to 'salhelper/source/makefile.mk')
-rw-r--r--salhelper/source/makefile.mk13
1 files changed, 3 insertions, 10 deletions
diff --git a/salhelper/source/makefile.mk b/salhelper/source/makefile.mk
index e0ac77c26b72..3029c5bd4bb4 100644
--- a/salhelper/source/makefile.mk
+++ b/salhelper/source/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.9 $
#
-# last change: $Author: jl $ $Date: 2001-04-19 15:36:36 $
+# last change: $Author: jsc $ $Date: 2001-05-04 13:24:41 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -74,14 +74,8 @@ USE_DEFFILE= TRUE
.INCLUDE : settings.mk
.INCLUDE : sv.mk
-.INCLUDE : ..$/version.mk
-
# --- Files --------------------------------------------------------
-# LIB1TARGET= $(LB)$/a$(TARGET).lib
-# LIB1ARCHIV= $(LB)$/lib$(TARGET)$(SALHELPER_MAJOR)$(COM).a
-# LIB1FILES= $(LB)$/$(TARGET).lib
-
#RTTI on
.IF "$(OS)" == "WNT"
CFLAGS+= -GR
@@ -93,10 +87,9 @@ SLOFILES= \
# SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols
.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX"
SLOFILES+=$(SLO)$/staticmb.obj
-#OBJFILES+=$(OBJ)$/staticmb.obj
.ENDIF
-SHL1TARGET= $(TARGET)$(SALHELPER_MAJOR)$(COM)
+SHL1TARGET= $(TARGET)$(UDK_MAJOR)$(COM)
SHL1STDLIBS= \
$(SALLIB)