Attachment #8157 for issue #17651

View | Details | Raw Unified | Return to issue 17651
Collapse All | Expand All




SHL1VERSIONMAP= sc.map
SHL1IMPLIB= sci

.IF "$(OS)"!="MACOSX"
# static libraries
SHL1STDLIBS+= $(SCHLIB)
.ENDIF

# dynamic libraries
SHL1STDLIBS+=       \
	$(BASICLIB)	\
	$(SFXLIB)		\
	$(SO2LIB)		\
	$(SVMEMLIB)	\
	$(SVTOOLLIB)	\
	$(SVLLIB)		\
	$(SVXLIB)		\

	$(TKLIB)		\
	$(VOSLIB)		\
	$(SALLIB)		\
	$(TOOLSLIB)	\
	$(UNOTOOLSLIB) \
	$(SOTLIB)		\
	$(XMLOFFLIB)	\
	$(DBTOOLSLIB)

.IF "$(OS)"=="MACOSX"
# static libraries at end for OS X
SHL1STDLIBS+= $(SCHLIB)
.ENDIF

SHL1DEPN=   $(L)$/itools.lib
SHL1LIBS=   $(LIB3TARGET) $(LIB4TARGET)

Return to issue 17651

Lines 110-124 Link Here

(-)util/makefile.mk (-5 / +11 lines)
110	SHL1VERSIONMAP= sc.map	110	SHL1VERSIONMAP= sc.map
111	SHL1IMPLIB= sci	111	SHL1IMPLIB= sci
112		112
		113	.IF "$(OS)"!="MACOSX"
113	# static libraries	114	# static libraries
114	SHL1STDLIBS+= $(SCHLIB)	115	SHL1STDLIBS+= $(SCHLIB)
		116	.ENDIF
115		117
116	# dynamic libraries	118	# dynamic libraries
117	SHL1STDLIBS+= \	119	SHL1STDLIBS+= \
118	$(BASICLIB) \	120	$(BASICLIB) \
119	$(SFXLIB) \	121	$(SFXLIB) \
120	$(SO2LIB) \	122	$(SO2LIB) \
121	$(SVMEMLIB) \	123	$(SVMEMLIB) \
122	$(SVTOOLLIB) \	124	$(SVTOOLLIB) \
123	$(SVLLIB) \	125	$(SVLLIB) \
124	$(SVXLIB) \	126	$(SVXLIB) \
Lines 132-143 Link Here
132	$(TKLIB) \	134	$(TKLIB) \
133	$(VOSLIB) \	135	$(VOSLIB) \
134	$(SALLIB) \	136	$(SALLIB) \
135	$(TOOLSLIB) \	137	$(TOOLSLIB) \
136	$(UNOTOOLSLIB) \	138	$(UNOTOOLSLIB) \
137	$(SOTLIB) \	139	$(SOTLIB) \
138	$(XMLOFFLIB) \	140	$(XMLOFFLIB) \
139	$(DBTOOLSLIB)	141	$(DBTOOLSLIB)
140		142
		143	.IF "$(OS)"=="MACOSX"
		144	# static libraries at end for OS X
		145	SHL1STDLIBS+= $(SCHLIB)
		146	.ENDIF
141		147
142	SHL1DEPN= $(L)$/itools.lib	148	SHL1DEPN= $(L)$/itools.lib
143	SHL1LIBS= $(LIB3TARGET) $(LIB4TARGET)	149	SHL1LIBS= $(LIB3TARGET) $(LIB4TARGET)