diff -r 409743731534 -r c5722f7db2ea open-src/lib/Makefile --- a/open-src/lib/Makefile Thu Mar 06 15:45:05 2008 -0800 +++ b/open-src/lib/Makefile Fri Mar 07 15:38:30 2008 -0800 @@ -28,10 +28,22 @@ # or other dealings in this Software without prior written authorization # of the copyright holder. # -# @(#)Makefile 1.14 08/02/27 +# @(#)Makefile 1.16 08/03/06 # ############################################################################### +# Order copied from X.Org's util/modular/build.sh: +# the libraries have a dependency order: +# xtrans, Xau, Xdmcp before anything else +# fontenc before Xfont +# ICE before SM +# X11 before Xext +# (X11 and SM) before Xt +# Xt before Xmu and Xpm and Xtst +# Xext before any other extension library +# Xfixes before Xcomposite +# Xp before XprintUtil before XprintAppUtil + OS_SUBDIRS_common = \ freetype \ fontconfig \ @@ -39,9 +51,10 @@ libXau \ libXdmcp \ libX11 \ + libfontenc \ libICE \ libSM \ - libfontenc \ + libXt \ libXmu \ libXpm \ libXaw \