Add autogenerated source files and other various non-CVS material to

    .cvsignore files
Use XORG_CFLAGS. Ensure that all exa files are in SOURCES
remove _XOPEN_SOURCE as it's always in xtrans.pc these days and gcc whines
libdamage.la needs libcw.la when COMPOSITE is defined, but that
    libdamage.la must be after libcomposite.la, so add libcw.la to
    DAMAGE_LIB instead of EXTENSION_LIBS. Regularize library link order
    across all X servers

5 files changed, 71 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 7337123d7..37dc51c31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,46 @@
+2005-08-07  Keith Packard  <keithp@keithp.com>
+
+	* .cvsignore:
+	* GL/mesa/X/.cvsignore:
+	* Xext/extmod/.cvsignore:
+	* afb/.cvsignore:
+	* cfb/.cvsignore:
+	* cfb16/.cvsignore:
+	* cfb24/.cvsignore:
+	* cfb32/.cvsignore:
+	* hw/dmx/.cvsignore:
+	* hw/dmx/config/.cvsignore:
+	* hw/vfb/.cvsignore:
+	* hw/xfree86/.cvsignore:
+	* hw/xfree86/common/.cvsignore:
+	* hw/xfree86/dixmods/.cvsignore:
+	* hw/xfree86/exa/.cvsignore:
+	* hw/xfree86/os-support/linux/drm/.cvsignore:
+	* hw/xfree86/ramdac/.cvsignore:
+	* hw/xfree86/scanpci/.cvsignore:
+	* hw/xfree86/x86emu/.cvsignore:
+	* hw/xfree86/xaa/.cvsignore:
+	* hw/xfree86/xf1bpp/.cvsignore:
+	* hw/xfree86/xf4bpp/.cvsignore:
+	* hw/xnest/.cvsignore:
+	* include/.cvsignore:
+	* mfb/.cvsignore:
+	Add autogenerated source files and other
+	various non-CVS material to .cvsignore files
+	
+	* hw/xfree86/exa/Makefile.am:
+	Use XORG_CFLAGS.  Ensure that all exa files are in SOURCES
+	
+	* include/dix-config.h.in:
+	remove _XOPEN_SOURCE as it's always in xtrans.pc these days
+	and gcc whines
+	
+	* configure.ac:
+	libdamage.la needs libcw.la when COMPOSITE is defined,
+	but that libdamage.la must be after libcomposite.la, so
+	add libcw.la to DAMAGE_LIB instead of EXTENSION_LIBS.
+	Regularize library link order across all X servers
+
 2005-08-07  Adam Jackson  <ajax@freedesktop.org>
 
 	* configure.ac:
diff --git a/configure.ac b/configure.ac
index 57128080a..c09aee467 100644
--- a/configure.ac
+++ b/configure.ac
@@ -585,7 +585,7 @@ EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/damageext/libdamageext.la'
 EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/damageext'
 
 if test "$COMPOSITE" = yes; then
-	EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/composite/libcomposite.la'" "'$(top_builddir)/miext/cw/libcw.la'
+	EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/composite/libcomposite.la'
 	EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/composite'
 fi
 
@@ -598,6 +598,10 @@ MI_INC='-I$(top_srcdir)/mi'
 FB_LIB='$(top_builddir)/fb/libfb.la'
 FB_INC='-I$(top_srcdir)/fb'
 DAMAGE_LIB='$(top_builddir)/miext/damage/libdamage.la'
+# damage (may) need the composite wrapper when composite is enabled
+if test "$COMPOSITE" = yes; then
+	DAMAGE_LIB="$DAMAGE_LIB "'$(top_builddir)/miext/cw/libcw.la'
+fi
 DAMAGE_INC='-I$(top_srcdir)/miext/damage'
 SHADOW_INC='-I$(top_srcdir)/miext/shadow'
 SHADOW_LIB='$(top_builddir)/miext/shadow/libshadow.la'
@@ -612,11 +616,11 @@ PKG_CHECK_MODULES([XSERVER], [$REQUIRED_MODULES])
 XSERVER_LIBS="${XSERVER_LIBS} -lm -lz"
 
 XORG_CORE_LIBS="$DIX_LIB"
-XORG_LIBS="$MI_LIB $XI_LIB $XKB_LIB $COMPOSITE_LIB $DAMAGE_LIB $EXTENSION_LIBS $XPSTUBS_LIB $OS_LIB"
+XORG_LIBS="$MI_LIB $EXTENSION_LIBS $XI_LIB $XKB_LIB $COMPOSITE_LIB $DAMAGE_LIB $XPSTUBS_LIB $OS_LIB"
 XVFB_LIBS="$FB_LIB $MI_LIB $GLX_LIBS $EXTENSION_LIBS $XI_LIB $XKB_LIB $COMPOSITE_LIB $DAMAGE_LIB $LAYER_LIB $XPSTUBS_LIB $OS_LIB"
 XNEST_LIBS="$FB_LIB $MI_LIB $GLX_LIBS $EXTENSION_LIBS $XI_LIB $XKB_LIB $COMPOSITE_LIB $DAMAGE_LIB $LAYER_LIB $XPSTUBS_LIB $OS_LIB"
-XWIN_LIBS="$FB_LIB $MI_LIB $XI_LIB $XKB_LIB $COMPOSITE_LIB $DAMAGE_LIB $LAYER_LIB $EXTENSION_LIBS $XPSTUBS_LIB $OS_LIB $SHADOW_LIB"
-XDMX_LIBS="$FB_LIB $MI_LIB $DMX_EXTENSIONS $XI_LIB $XKB_LIB $DAMAGE_LIB $OS_LIB $SHADOW_LIB"
+XWIN_LIBS="$FB_LIB $MI_LIB $EXTENSION_LIBS $XI_LIB $XKB_LIB $COMPOSITE_LIB $DAMAGE_LIB $LAYER_LIB $XPSTUBS_LIB $OS_LIB $SHADOW_LIB"
+XDMX_LIBS="$FB_LIB $MI_LIB $DMX_EXTENSIONS $EXTENSION_LIBS $XI_LIB $XKB_LIB $DAMAGE_LIB $OS_LIB $SHADOW_LIB"
 XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
 XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
 XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
diff --git a/exa/Makefile.am b/exa/Makefile.am
index 045033165..7a5e7905b 100644
--- a/exa/Makefile.am
+++ b/exa/Makefile.am
@@ -5,5 +5,13 @@ sdk_HEADERS = exa.h
 libexa_la_LDFLAGS = -avoid-version
 
 INCLUDES = $(XORG_INCS)
-DEFS += -DPIXPRIV
-libexa_la_SOURCES = exa.c exaasync.c exaoffscreen.c exapict.c
+
+AM_CFLAGS = $(XORG_CFLAGS)
+
+libexa_la_SOURCES = \
+	exaasync.c \
+	exa.c \
+	exa.h \
+	exaoffscreen.c \
+	exapict.c \
+	exaPriv.h
diff --git a/hw/xfree86/exa/Makefile.am b/hw/xfree86/exa/Makefile.am
index 045033165..7a5e7905b 100644
--- a/hw/xfree86/exa/Makefile.am
+++ b/hw/xfree86/exa/Makefile.am
@@ -5,5 +5,13 @@ sdk_HEADERS = exa.h
 libexa_la_LDFLAGS = -avoid-version
 
 INCLUDES = $(XORG_INCS)
-DEFS += -DPIXPRIV
-libexa_la_SOURCES = exa.c exaasync.c exaoffscreen.c exapict.c
+
+AM_CFLAGS = $(XORG_CFLAGS)
+
+libexa_la_SOURCES = \
+	exaasync.c \
+	exa.c \
+	exa.h \
+	exaoffscreen.c \
+	exapict.c \
+	exaPriv.h
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index ec329887d..b6c537f14 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -371,9 +371,6 @@
 /* POSIX-compliant source */
 #undef _POSIX_SOURCE
 
-/* X/Open-compliant source */
-#undef _XOPEN_SOURCE
-
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const