summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2006-05-24 13:35:57 +0000
committerVladimir Glazounov <vg@openoffice.org>2006-05-24 13:35:57 +0000
commit1f2f8b4222fb735930483e7474703199c143f4db (patch)
tree3b59a0a3225b3571e90b2555b25851c453cb5e6d
parent9ceff75c178538b7f181a6800202dd53a7fba2a3 (diff)
INTEGRATION: CWS ause043 (1.6.2); FILE MERGED
2005/11/03 14:53:35 hjs 1.6.2.1: #i56702# remove overrides for default uno header generation
-rw-r--r--package/source/xstor/makefile.mk19
1 files changed, 4 insertions, 15 deletions
diff --git a/package/source/xstor/makefile.mk b/package/source/xstor/makefile.mk
index 4f2bbbd78912..cd9b6cd039d3 100644
--- a/package/source/xstor/makefile.mk
+++ b/package/source/xstor/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.6 $
+# $Revision: 1.7 $
#
-# last change: $Author: rt $ $Date: 2005-10-19 12:48:09 $
+# last change: $Author: vg $ $Date: 2006-05-24 14:35:57 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -38,11 +38,11 @@ PRJ=..$/..
PRJNAME=package
TARGET=xstor
+ENABLE_EXCEPTIONS=TRUE
+
# --- Settings -----------------------------------------------------
-.INCLUDE : svpre.mk
.INCLUDE : settings.mk
-.INCLUDE : sv.mk
# --- Files --------------------------------------------------------
@@ -56,16 +56,6 @@ SLOFILES = \
$(SLO)$/switchpersistencestream.obj\
$(SLO)$/register.obj
-EXCEPTIONSFILES= \
- $(SLO)$/ocompinstream.obj\
- $(SLO)$/oseekinstream.obj\
- $(SLO)$/owriteablestream.obj\
- $(SLO)$/xstorage.obj\
- $(SLO)$/xfactory.obj\
- $(SLO)$/disposelistener.obj\
- $(SLO)$/switchpersistencestream.obj\
- $(SLO)$/register.obj
-
SHL1TARGET=$(TARGET)
SHL1STDLIBS=\
$(SALLIB) \
@@ -77,7 +67,6 @@ SHL1OBJS=$(SLOFILES)
SHL1DEF=$(MISC)$/$(TARGET).def
SHL1IMPLIB=i$(SHL1TARGET)
-SHL1LIBS=
DEF1NAME=$(SHL1TARGET)
DEF1EXPORTFILE=$(SHL1TARGET).dxp