Reorder static libraries to avoid the need to link them twice

master
Pavel Roskin 8 years ago
parent d93bb4cf4b
commit cd6e8faccc

@ -26,23 +26,24 @@ fbcmap_mi.o
#fbcmap_mi.o #fbcmap_mi.o
#fbcmap.o #fbcmap.o
LIBS = $(XSRCBASE)/dbe/.libs/libdbe.a \ LIBS = \
$(XSRCBASE)/dix/.libs/libdix.a \
$(XSRCBASE)/dix/.libs/libmain.a \ $(XSRCBASE)/dix/.libs/libmain.a \
librdp.a \
$(XSRCBASE)/dbe/.libs/libdbe.a \
$(XSRCBASE)/dix/.libs/libdix.a \
$(XSRCBASE)/fb/.libs/libfb.a \ $(XSRCBASE)/fb/.libs/libfb.a \
$(XSRCBASE)/mi/.libs/libmi.a \ $(XSRCBASE)/mi/.libs/libmi.a \
$(XSRCBASE)/os/.libs/libos.a \
$(XSRCBASE)/randr/.libs/librandr.a \ $(XSRCBASE)/randr/.libs/librandr.a \
$(XSRCBASE)/record/.libs/librecord.a \
$(XSRCBASE)/render/.libs/librender.a \ $(XSRCBASE)/render/.libs/librender.a \
$(XSRCBASE)/os/.libs/libos.a \
$(XSRCBASE)/record/.libs/librecord.a \
$(XSRCBASE)/xkb/.libs/libxkb.a \ $(XSRCBASE)/xkb/.libs/libxkb.a \
$(XSRCBASE)/Xext/.libs/libXext.a \ $(XSRCBASE)/Xext/.libs/libXext.a \
$(XSRCBASE)/Xi/.libs/libXi.a \ $(XSRCBASE)/Xi/.libs/libXi.a \
$(XSRCBASE)/glx/.libs/libglx.a \ $(XSRCBASE)/glx/.libs/libglx.a \
$(XSRCBASE)/xfixes/.libs/libxfixes.a \ $(XSRCBASE)/xfixes/.libs/libxfixes.a \
$(XSRCBASE)/damageext/.libs/libdamageext.a \ $(XSRCBASE)/damageext/.libs/libdamageext.a \
$(XSRCBASE)/miext/damage/.libs/libdamage.a \ $(XSRCBASE)/miext/damage/.libs/libdamage.a
librdp.a
LLIBS = -Wl,-rpath=$(LIBBASE) -lfreetype -lz -lm -lXfont -lXau \ LLIBS = -Wl,-rpath=$(LIBBASE) -lfreetype -lz -lm -lXfont -lXau \
-lXdmcp -lpixman-1 -lrt -ldl -lcrypto -lGL -lXdamage -lXdmcp -lpixman-1 -lrt -ldl -lcrypto -lGL -lXdamage
@ -101,7 +102,7 @@ all: X11rdp
X11rdp: $(OBJS) X11rdp: $(OBJS)
$(AR) rvu librdp.a $(OBJS) $(AR) rvu librdp.a $(OBJS)
ranlib librdp.a ranlib librdp.a
$(CC) $(LDFLAGS) -o X11rdp $(LIBS) $(LIBS) $(LLIBS) $(CC) $(LDFLAGS) -o X11rdp $(LIBS) $(LLIBS)
clean: clean:
rm -f $(OBJS) librdp.a rm -f $(OBJS) librdp.a

Loading…
Cancel
Save