frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dmx: include xfixes lib, reshuffle include order to resolve linker errors. 

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-08-04 17:04:08 +10:00
parent 2d46678762
commit 33243ae971
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -1736,7 +1736,7 @@ if test "x$DMX" = xyes; then
fi fi
DMX_INCLUDES="$XEXT_INC $RENDER_INC $RECORD_INC" DMX_INCLUDES="$XEXT_INC $RENDER_INC $RECORD_INC"
XDMX_CFLAGS="$DMXMODULES_CFLAGS" XDMX_CFLAGS="$DMXMODULES_CFLAGS"
XDMX_LIBS="$XEXT_LIB $FB_LIB $CONFIG_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB" XDMX_LIBS="$XEXT_LIB $FB_LIB $CONFIG_LIB $FIXES_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB"
XDMX_SYS_LIBS="$DMXMODULES_LIBS" XDMX_SYS_LIBS="$DMXMODULES_LIBS"
AC_SUBST([XDMX_CFLAGS]) AC_SUBST([XDMX_CFLAGS])
AC_SUBST([XDMX_LIBS]) AC_SUBST([XDMX_LIBS])

3
hw/dmx/Makefile.am
View File

@ -86,7 +86,8 @@ XDMX_LIBS = \
input/libdmxinput.a \ input/libdmxinput.a \
config/libdmxconfig.a \ config/libdmxconfig.a \
$(MAIN_LIB) \ $(MAIN_LIB) \
$(XSERVER_LIBS) $(XSERVER_LIBS) \
$(top_srcdir)/xfixes/libxfixes.la
Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
Xdmx_DEPENDENCIES= $(XDMX_LIBS) Xdmx_DEPENDENCIES= $(XDMX_LIBS)