1634N/A--- a/hw/xfree86/Makefile.am Fri Jan 8 15:06:52 2016
1634N/A+++ b/hw/xfree86/Makefile.am Fri Jan 8 15:10:09 2016
1634N/A@@ -34,10 +34,10 @@
1333N/A INT10_SUBDIR = int10
1333N/A endif
1265N/A
1333N/A-SUBDIRS = common ddc x86emu $(INT10_SUBDIR) os-support parser \
1333N/A- ramdac $(VGAHW_SUBDIR) loader modes $(DRI_SUBDIR) \
1333N/A- $(DRI2_SUBDIR) . $(VBE_SUBDIR) i2c dixmods \
1549N/A- fbdevhw shadowfb exa $(XF86UTILS_SUBDIR) doc man \
1333N/A+SUBDIRS = common ddc i2c x86emu $(INT10_SUBDIR) fbdevhw os-support parser \
1333N/A+ ramdac shadowfb $(VBE_SUBDIR) $(VGAHW_SUBDIR) loader \
1634N/A+ $(DRI_SUBDIR) $(DRI2_SUBDIR) . dixmods exa modes \
1549N/A+ $(XF86UTILS_SUBDIR) doc man \
1549N/A $(GLAMOR_EGL_SUBDIR) drivers
1265N/A
1265N/A DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
1634N/A@@ -48,7 +48,7 @@
1265N/A bin_PROGRAMS = Xorg
1265N/A nodist_Xorg_SOURCES = sdksyms.c
1265N/A
1265N/A-AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
1265N/A+AM_CFLAGS = $(DIX_CFLAGS) $(PIXMAN_CFLAGS) @XORG_CFLAGS@
1634N/A AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/parser \
1333N/A -I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac \
1549N/A -I$(srcdir)/dri -I$(srcdir)/dri2 -I$(top_srcdir)/dri3
1634N/A@@ -135,14 +135,17 @@
1549N/A EXTRA_DIST += sdksyms.sh
1549N/A
1549N/A sdksyms.dep sdksyms.c: sdksyms.sh
1549N/A- $(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(AM_CPPFLAGS)
1634N/A+ $(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' SED='$(SED)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(AM_CPPFLAGS) -I/usr/include -I/usr/include/xorg -I/usr/include/pixman-1 -I/usr/include/X11/dri
1549N/A
1549N/A SDKSYMS_DEP = sdksyms.dep
1549N/A--include $(SDKSYMS_DEP)
1549N/A+include $(SDKSYMS_DEP)
1549N/A
1549N/A i2c/libi2c.la:
1549N/A $(AM_V_at)cd i2c && $(MAKE) libi2c.la
1549N/A
1549N/A+modes/libxf86modes.la:
1549N/A+ $(AM_V_at)cd modes && $(MAKE) libxf86modes.la
1549N/A+
1549N/A dixmods/libdixmods.la:
1549N/A $(AM_V_at)cd dixmods && $(MAKE) libdixmods.la
1549N/A
1634N/A--- a/hw/xfree86/dixmods/Makefile.am Fri Jan 8 15:10:28 2016
1634N/A+++ b/hw/xfree86/dixmods/Makefile.am Fri Jan 8 15:11:36 2016
1634N/A@@ -18,7 +18,9 @@
1584N/A -I$(top_srcdir)/glx
1584N/A
1584N/A libfb_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG)
1584N/A+libfb_la_LDFLAGS += $(XORG_EXTERNS_FLAG)
1584N/A libfb_la_LIBADD = $(top_builddir)/fb/libfb.la
1584N/A+libfb_la_LIBADD += -lpixman-1
1584N/A libfb_la_SOURCES = fbmodule.c
1584N/A libfb_la_CFLAGS = $(AM_CFLAGS)
1584N/A
1634N/A@@ -28,9 +30,12 @@
1584N/A libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER
1584N/A
1584N/A libglx_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG)
1584N/A+libglx_la_LDFLAGS += $(XORG_EXTERNS_FLAG)
1584N/A libglx_la_LIBADD = $(top_builddir)/glx/libglx.la $(GLX_SYS_LIBS)
1584N/A if AIGLX_DRI_LOADER
1584N/A libglx_la_LIBADD += $(top_builddir)/glx/libglxdri.la
1584N/A+libglx_la_LDFLAGS += -R$(extsmoduledir)
1584N/A+libglx_la_LDFLAGS += $(LIBDRM_LIBS)
1584N/A if NO_UNDEFINED
1584N/A libglx_la_LIBADD += $(LIBDRM_LIBS) $(PIXMAN_LIBS)
1584N/A endif
1634N/A@@ -39,6 +44,8 @@
1584N/A
1584N/A libshadow_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG)
1584N/A libshadow_la_LIBADD = $(top_builddir)/miext/shadow/libshadow.la
1584N/A+libshadow_la_DEPENDENCIES = libfb.la
1584N/A+libshadow_la_LDFLAGS += $(XORG_EXTERNS_FLAG)
1584N/A if NO_UNDEFINED
1584N/A libshadow_la_LIBADD += libfb.la
1584N/A endif
1634N/A--- a/hw/xfree86/shadowfb/Makefile.am Fri Jan 8 15:12:06 2016
1634N/A+++ b/hw/xfree86/shadowfb/Makefile.am Fri Jan 8 15:12:25 2016
1634N/A@@ -8,3 +8,6 @@
1584N/A AM_CPPFLAGS = $(XORG_INCS)
1584N/A
1584N/A AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
1584N/A+
1584N/A+libshadowfb_la_LDFLAGS += $(XORG_EXTERNS_FLAG)
1584N/A+libshadowfb_la_LIBADD += -lXfont
1634N/A--- a/hw/xfree86/vbe/Makefile.am Fri Jan 8 15:12:44 2016
1634N/A+++ b/hw/xfree86/vbe/Makefile.am Fri Jan 8 15:13:05 2016
1634N/A@@ -12,3 +12,5 @@
1584N/A AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
1584N/A -I$(srcdir)/../modes -I$(srcdir)/../parser \
1584N/A -I$(srcdir)/../int10
1584N/A+
1584N/A+libvbe_la_LDFLAGS += $(XORG_EXTERNS_FLAG)
1634N/A--- a/configure.ac Fri Jan 8 15:04:41 2016
1634N/A+++ b/configure.ac Fri Jan 8 15:06:30 2016
1634N/A@@ -244,6 +244,8 @@
1634N/A dnl Find the math libary, then check for cbrt function in it.
1634N/A AC_CHECK_LIB(m, sqrt)
1634N/A AC_CHECK_FUNCS([cbrt])
1634N/A+# But we don't want to link everything with libm
1634N/A+LIBS="${LIBS//-lm}"
1634N/A
1634N/A AC_CHECK_HEADERS([ndbm.h dbm.h rpcsvc/dbm.h])
1634N/A
1634N/A@@ -1731,6 +1731,7 @@
1634N/A XSERVER_LIBS="$DIX_LIB $MI_LIB $OS_LIB"
1634N/A XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS}"
1634N/A XSERVER_SYS_LIBS="${XSERVER_SYS_LIBS} -lproject"
1634N/A+XSERVER_SYS_LIBS="${XSERVER_SYS_LIBS} -lm"
1634N/A AC_SUBST([XSERVER_LIBS])
1634N/A AC_SUBST([XSERVER_SYS_LIBS])
1634N/A
1634N/A@@ -1761,7 +1761,7 @@
1634N/A [AC_LANG_SOURCE([int main(int argc, char **argv) { return 0; }])],
1634N/A [mv conftest$EXEEXT conftest.parent
1634N/A XORG_CHECK_LINKER_FLAGS([-Wl,-z,parent=conftest.parent -G],
1634N/A- [LD_NO_UNDEFINED_FLAG="-Wl,-z,defs -Wl,-z,parent=\$(top_builddir)/hw/xfree86/Xorg"
1634N/A+ [LD_NO_UNDEFINED_FLAG="-Wl,-z,defs -Wl,-z,parent=\${bindir}/Xorg"
1634N/A # Not set yet, since this gets exported in xorg-server.pc to all the drivers,
1634N/A # and they're not all fixed to build correctly with it yet.
1634N/A # XORG_DRIVER_LIBS="-Wl,-z,defs -Wl,-z,parent=${bindir}/Xorg"