fix library link order to work with link --as-needed

This commit is contained in:
Petr Mladek
2012-04-13 16:52:59 +02:00
parent 4d6a36dd0c
commit f6eba1a27a
2 changed files with 5 additions and 4 deletions

View File

@@ -111,14 +111,14 @@ SHL2VERSIONMAP=$(TARGET2).map
SHL2TARGET= $(TARGET2)$(KAB_MAJOR) SHL2TARGET= $(TARGET2)$(KAB_MAJOR)
SHL2OBJS=$(SLO2FILES) SHL2OBJS=$(SLO2FILES)
SHL2LINKFLAGS+=$(KAB_LIB)
SHL2STDLIBS=\ SHL2STDLIBS=\
$(CPPULIB) \ $(CPPULIB) \
$(CPPUHELPERLIB) \ $(CPPUHELPERLIB) \
$(SALLIB) \ $(SALLIB) \
$(SALHELPERLIB) \ $(SALHELPERLIB) \
$(DBTOOLSLIB) \ $(DBTOOLSLIB) \
$(COMPHELPERLIB) $(COMPHELPERLIB) \
$(KAB_LIB)
SHL2DEPN= SHL2DEPN=
SHL2IMPLIB= i$(TARGET2) SHL2IMPLIB= i$(TARGET2)

View File

@@ -63,11 +63,12 @@ SHL1OBJS=$(SLOFILES)
SHL1DEF=$(MISC)$/$(SHL1TARGET).def SHL1DEF=$(MISC)$/$(SHL1TARGET).def
SHL1IMPLIB=i$(SHL1TARGET) SHL1IMPLIB=i$(SHL1TARGET)
SHL1LINKFLAGS+=$(KDE_LIBS) -lkio
SHL1STDLIBS= \ SHL1STDLIBS= \
$(CPPUHELPERLIB) \ $(CPPUHELPERLIB) \
$(CPPULIB) \ $(CPPULIB) \
$(SALLIB) $(SALLIB) \
$(KDE_LIBS) \
-lkio
SHL1DEF=$(MISC)$/$(SHL1TARGET).def SHL1DEF=$(MISC)$/$(SHL1TARGET).def
DEF1NAME=$(SHL1TARGET) DEF1NAME=$(SHL1TARGET)