summaryrefslogtreecommitdiff
path: root/basic/util
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2003-03-18 15:28:40 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2003-03-18 15:28:40 +0000
commit9778aa12dbc0202478fbb5ce28d7e7c5bde9c793 (patch)
tree81b84e9dcb66142d93ef3ec3ad019d578f373e6f /basic/util
parent16a013ff8c8f4b4935552ac5ebdb27153582eb0e (diff)
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'basic/util')
-rw-r--r--basic/util/makefile.mk64
1 files changed, 3 insertions, 61 deletions
diff --git a/basic/util/makefile.mk b/basic/util/makefile.mk
index ca3ba25872a6..2c3e5134756f 100644
--- a/basic/util/makefile.mk
+++ b/basic/util/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.11 $
+# $Revision: 1.12 $
#
-# last change: $Author: hr $ $Date: 2002-04-30 14:32:19 $
+# last change: $Author: hr $ $Date: 2003-03-18 16:28:40 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -96,8 +96,7 @@ SHL1STDLIBS= \
$(COMPHELPERLIB) \
$(UNOTOOLSLIB) \
$(SOTLIB) \
- $(VOSLIB) \
- $(XMLSCRIPTLIB)
+ $(VOSLIB)
.IF "$(SOLAR_JAVA)" != "TRUE"
SHL1STDLIBS+=$(SJLIB)
@@ -123,50 +122,6 @@ DEFLIB1NAME =sb
DEF1DES =StarBasic
-# Light basic
-LIB2TARGET=$(SLB)$/sbl.lib
-LIB2FILES= \
- $(SLB)$/basicmgr.lib \
- $(SLB)$/classesl.lib \
- $(SLB)$/comp.lib \
- $(SLB)$/runtime.lib
-
-SHL2TARGET= sbl$(UPD)$(DLLPOSTFIX)
-SHL2IMPLIB= basicl
-
-SHL2STDLIBS= \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(TOOLSLIB) \
- $(SVTOOLLIB) \
- $(SVLLIB) \
- $(SVLIB) \
- $(VOSLIB) \
- $(SALLIB) \
- $(SVMEMLIB) \
- $(SOTLIB) \
- $(VOSLIB) \
- $(COMPHELPERLIB) \
- $(UNOTOOLSLIB)
-
-.IF "$(SOLAR_JAVA)" != "TRUE"
-SHL2STDLIBS+=$(SJLIB)
-.ENDIF
-.IF "$(GUI)" != "UNX"
-SHL2OBJS= \
- $(SLO)$/sb.obj
-.ENDIF
-
-SHL2DEF= $(MISC)$/$(SHL2TARGET).def
-SHL2LIBS= $(SLB)$/sbl.lib
-
-DEF2NAME =$(SHL2TARGET)
-DEF2DEPN = \
- $(MISC)$/$(SHL2TARGET).flt $(SLB)$/sbl.lib
-
-DEFLIB2NAME =sbl
-DEF2DES =StarBasic Light
-
RES1TARGET=$(PRJNAME)
SRS1FILES= \
$(SRS)$/classes.srs
@@ -205,19 +160,6 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk
@echo bad_alloc >> $@
@echo __CT >> $@
-$(MISC)$/$(SHL2TARGET).flt: makefile.mk
- @echo ------------------------------
- @echo Making: $@
- @echo WEP > $@
- @echo LIBMAIN >> $@
- @echo LibMain >> $@
- @echo Sbi >> $@
- @echo SvRTL >> $@
- @echo SbRtl_ >> $@
- @echo exception >> $@
- @echo bad_alloc >> $@
- @echo __CT >> $@
-
$(SRS)$/basic.srs:
+$(TYPE) $(SRS)$/classes.srs + $(SRS)$/runtime.srs > $@