From cd6e8faccccc7496fcced3177e1289a4d117090d Mon Sep 17 00:00:00 2001
From: Pavel Roskin <plroskin@gmail.com>
Date: Sun, 13 Nov 2016 09:04:59 -0800
Subject: [PATCH] Reorder static libraries to avoid the need to link them twice

---
 xorg/X11R7.6/rdp/Makefile | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

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