[xserver-commit] xserver ChangeLog,3.146,3.147 configure.ac,3.65,3.66

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xserver
In directory pdx:/tmp/cvs-serv2122

Modified Files:
	ChangeLog configure.ac 
Log Message:
Twenty link errors for Xizzle now - count 'em. 20.

        * *.c:
        * *.h:
        Get rid of all references to SCO.

        * hw/xizzle/*/Makefile.am:
        Change SDK include dir to $(includedir)/xizzle.
        Add SDK libs where necessary.

        * hw/xizzle/Makefile.am:
        Reformat to be nicer and easier to shuffle around; also, fix lib
        ordering so we get so much closer to the elusive final link.
        Shuffle common/xf86Init.c into libxizzle.a.

        * hw/xizzle/common/Makefile.am:
        Fix a couple of early snafus - s/BUILDXI/XINPUT/, et al; make the SDK
        stuff conditional as needed; fix the SBus includes.

        * hw/xizzle/os-support/Makefile.am:
        Name library os-support/libxizzleos.a, not
        os-support/foo/libxizzlefoo.a.
        Clean up ARCH_SOURCES so it's always initialised to something.

        * hw/xizzle/os-support/linux/Makefile.am:
        Move linked libraries to _LIBADD, which somehow escaped my attention.
        Make inclusion of drm/libxizzlelinuxdrm.a dependent on DRI.

        * hw/xizzle/vbe/vbe.c:
        s/VERSION/VBE_VERSION/;

        * hw/xizzle/Xi:
        Axe this redundant dir.

        * configure.ac:
        All Xizzle-specific: axe hw/xizzle/Xi, shuffle link order, fix list of
        required modules to be vaguely sane, add some pertinent libs/incs.


Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.146
retrieving revision 3.147
diff -u -d -r3.146 -r3.147
--- a/ChangeLog	9 Mar 2004 13:30:14 -0000	3.146
+++ b/ChangeLog	10 Mar 2004 11:49:11 -0000	3.147
@@ -1,3 +1,40 @@
+2004-03-10  Daniel Stone  <daniel@freedesktop.org>
+	* *.c:
+	* *.h:
+	Get rid of all references to SCO.
+
+	* hw/xizzle/*/Makefile.am:
+	Change SDK include dir to $(includedir)/xizzle.
+	Add SDK libs where necessary.
+
+	* hw/xizzle/Makefile.am:
+	Reformat to be nicer and easier to shuffle around; also, fix lib
+	ordering so we get so much closer to the elusive final link.
+	Shuffle common/xf86Init.c into libxizzle.a.
+
+	* hw/xizzle/common/Makefile.am:
+	Fix a couple of early snafus - s/BUILDXI/XINPUT/, et al; make the SDK
+	stuff conditional as needed; fix the SBus includes.
+
+	* hw/xizzle/os-support/Makefile.am:
+	Name library os-support/libxizzleos.a, not
+	os-support/foo/libxizzlefoo.a.
+	Clean up ARCH_SOURCES so it's always initialised to something.
+
+	* hw/xizzle/os-support/linux/Makefile.am:
+	Move linked libraries to _LIBADD, which somehow escaped my attention.
+	Make inclusion of drm/libxizzlelinuxdrm.a dependent on DRI.
+
+	* hw/xizzle/vbe/vbe.c:
+	s/VERSION/VBE_VERSION/;
+
+	* hw/xizzle/Xi:
+	Axe this redundant dir.
+
+	* configure.ac:
+	All Xizzle-specific: axe hw/xizzle/Xi, shuffle link order, fix list of
+	required modules to be vaguely sane, add some pertinent libs/incs.
+
 2004-03-09  Daniel Stone  <daniel@freedesktop.org>
 	* include/regionstr.h:
 	* include/extnsionst.h:

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.65
retrieving revision 3.66
diff -u -d -r3.65 -r3.66
--- a/configure.ac	9 Mar 2004 13:43:10 -0000	3.65
+++ b/configure.ac	10 Mar 2004 11:49:11 -0000	3.66
@@ -168,7 +168,6 @@
 AM_CONDITIONAL(XIZZLESERVER, [test x$XIZZLESERVER = xyes])
 if test "$XIZZLESERVER" = yes; then
 	AC_DEFINE(XIZZLESERVER,,[Build Xizzle server])
-	XIZZLE_REQUIRED_MODULES="x11 xext xfont xdmcp"
 fi
 
 AM_CONDITIONAL(XTRAP, [test x$XTRAP = xyes])
@@ -203,6 +202,8 @@
 if test "$XINPUT" = yes; then
 	AC_DEFINE(XINPUT,1,[Support X Input extension])
 	REQUIRED_MODULES="$REQUIRED_MODULES xi"
+	EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/Xi'
+	EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/Xi/libXi.a'
 fi
 
 AM_CONDITIONAL(XINERAMA, [test x$XINERAMA = xyes])
@@ -418,16 +419,16 @@
 XIZZLE_INCS=
 XIZZLE_OS=
 if test "$XIZZLESERVER" = yes; then
-	PKG_CHECK_MODULES(XIZZLESERVER, $XIZZLE_REQUIRED_MODULES)
-	XIZZLE_LIB='$(top_builddir)/hw/xizzle/libxizzle.a'
 	XIZZLE_INC='-I$(top_srcdir)/hw/xizzle/include \\\
 	-I$(top_srcdir)/hw/xizzle/common \\\
 	-I$(top_srcdir)/hw/xizzle/os-support \\\
 	-I$(top_srcdir)/include \\\
 	-I$(top_srcdir)/hw/xizzle/os-support/bus'
-	XIZZLE_LIBS="$DIX_LIB $OS_LIB $EXTENSION_LIBS $MI_LIB \
-	             $SHADOW_LIB $XIZZLESERVER_LIBS"
-	XIZZLE_INCS="$XIZZLE_INC $EXTENSION_INCS $MI_INC $XIZZLESERVER_INCS"
+	XIZZLE_CORE_LIBS="$DIX_LIB $OS_LIB"
+	XIZZLE_LIBS="$FB_LIB $MI_LIB $EXTENSION_LIBS $DAMAGE_LIB $SHADOW_LIB \
+	             $XPSTUBS_LIB"
+	XIZZLE_INCS="$XIZZLE_INC $EXTENSION_INCS $MI_INC $DAMAGE_INC \
+	             $SHADOW_INC $FB_INC $XSERVER_CFLAGS "'-I$(top_srcdir)/os'
 	XIZZLE_CFLAGS="$XIZZLESERVER_CFLAGS -D_XOPEN_SOURCE -D_POSIX_SOURCE=500 \
 	               -D_BSD_SOURCE -Wall -DNEED_XF86_TYPES"
 	case $host_os in
@@ -439,6 +440,7 @@
 	  freebsd*)
 	  	# support: nay
 		# daniel has an account on an fbsd box, working on this
+		# jaymz too
 	  	XIZZLE_OS="freebsd"
 		XIZZLE_OS_SUBDIR="bsd"
 		;;
@@ -471,6 +473,7 @@
 		;;
 	esac
 fi
+AC_SUBST([XIZZLE_CORE_LIBS])
 AC_SUBST([XIZZLE_LIBS])
 AC_SUBST([XIZZLE_INCS])
 AC_SUBST([XIZZLE_CFLAGS])
@@ -531,6 +534,7 @@
 damageext/Makefile
 composite/Makefile
 Xext/Makefile
+Xi/Makefile
 hw/Makefile
 hw/kdrive/Makefile
 hw/kdrive/src/Makefile
@@ -573,5 +577,4 @@
 hw/xizzle/xaa/msb_first/Makefile
 hw/xizzle/xaa/lsb_fixed/Makefile
 hw/xizzle/xaa/msb_fixed/Makefile
-hw/xizzle/Xi/Makefile
 ])