diff options
Diffstat (limited to 'basic/util/makefile.mk')
| -rw-r--r-- | basic/util/makefile.mk | 76 |
1 files changed, 37 insertions, 39 deletions
diff --git a/basic/util/makefile.mk b/basic/util/makefile.mk index 1ee30e2fef..635b293698 100644 --- a/basic/util/makefile.mk +++ b/basic/util/makefile.mk @@ -40,42 +40,40 @@ GEN_HID=TRUE LIB1TARGET=$(SLB)$/sb.lib LIB1FILES= \ - $(SLB)$/basicmgr.lib \ - $(SLB)$/classes.lib \ - $(SLB)$/comp.lib \ + $(SLB)$/basicmgr.lib \ + $(SLB)$/classes.lib \ + $(SLB)$/comp.lib \ $(SLB)$/uno.lib \ - $(SLB)$/runtime.lib \ - $(SLB)$/sbx.lib + $(SLB)$/runtime.lib \ + $(SLB)$/sbx.lib SHL1TARGET= sb$(DLLPOSTFIX) SHL1IMPLIB= basic SHL1STDLIBS= \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(TOOLSLIB) \ - $(SVTOOLLIB) \ - $(SVLLIB) \ - $(VCLLIB) \ - $(VOSLIB) \ - $(SALLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) \ + $(TOOLSLIB) \ + $(SVTOOLLIB) \ + $(SVLLIB) \ + $(VCLLIB) \ + $(SALLIB) \ $(SALHELPERLIB) \ - $(COMPHELPERLIB) \ - $(UNOTOOLSLIB) \ - $(SOTLIB) \ - $(VOSLIB) \ - $(XMLSCRIPTLIB) + $(COMPHELPERLIB) \ + $(UNOTOOLSLIB) \ + $(SOTLIB) \ + $(XMLSCRIPTLIB) .IF "$(GUI)"=="WNT" SHL1STDLIBS+= \ - $(UWINAPILIB) \ - $(OLEAUT32LIB) + $(UWINAPILIB) \ + $(OLEAUT32LIB) .ENDIF # WNT .IF "$(GUI)" != "UNX" .IF "$(COM)" != "GCC" SHL1OBJS= \ - $(SLO)$/sb.obj + $(SLO)$/sb.obj .ENDIF .ENDIF @@ -84,7 +82,7 @@ SHL1LIBS= $(SLB)$/sb.lib DEF1NAME =$(SHL1TARGET) DEF1DEPN = \ - $(MISC)$/$(SHL1TARGET).flt + $(MISC)$/$(SHL1TARGET).flt DEFLIB1NAME =sb DEF1DES =StarBasic @@ -92,8 +90,8 @@ DEF1DES =StarBasic RES1TARGET=$(PRJNAME) SRS1FILES= \ - $(SRS)$/classes.srs \ - $(SRS)$/sbx.srs + $(SRS)$/classes.srs \ + $(SRS)$/sbx.srs # --- TESTTOOL IDE ------------------------------------------------------ # The resources are linked here @@ -101,13 +99,13 @@ SRS1FILES= \ RESLIB1NAME=stt RESLIB1IMAGES=$(PRJ)$/res RESLIB1SRSFILES= \ - $(SRS)$/app.srs + $(SRS)$/app.srs RESLIB2NAME=sb RESLIB2IMAGES=$(PRJ)$/res RESLIB2SRSFILES= \ - $(SRS)$/classes.srs \ - $(SRS)$/sbx.srs + $(SRS)$/classes.srs \ + $(SRS)$/sbx.srs ########## remove sbx.srx (and this line) when issue i53795 is fixed # --- Targets ----------------------------------------------------------- @@ -124,20 +122,20 @@ RESLIB2SRSFILES= \ # --- Basic-Filter-Datei --- $(MISC)$/$(SHL1TARGET).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 >> $@ + @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 + $(SRS)$/sbx.srs > $@ + $(TYPE) $(SRS)$/classes.srs + $(SRS)$/runtime.srs + $(SRS)$/sbx.srs > $@ ALLTAR : $(MISC)/sb.component |