[xserver-commit] xserver/dix Makefile.am,3.7,3.7.2.1

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/dix
In directory pdx:/tmp/cvs-serv3073/dix

Modified Files:
      Tag: xfixes_2_branch
	Makefile.am 
Log Message:
	* Makefile.am:
	* Xext/Makefile.am:
	* configure.ac:
	* damageext/Makefile.am:
	* dix/Makefile.am:
	* fb/Makefile.am:
	* hw/kdrive/fbdev/Makefile.am:
	* hw/kdrive/linux/Makefile.am:
	* hw/kdrive/mach64/Makefile.am:
	* hw/kdrive/mga/Makefile.am:
	* hw/kdrive/nvidia/Makefile.am:
	* hw/kdrive/r128/Makefile.am:
	* hw/kdrive/smi/Makefile.am:
	* hw/kdrive/src/Makefile.am:
	* hw/kdrive/vesa/Makefile.am:
	* hw/xnest/Makefile.am:
	* mi/Makefile.am:
	* miext/damage/Makefile.am:
	* miext/shadow/Makefile.am:
	* os/Makefile.am:
	* randr/Makefile.am:
	* render/Makefile.am:
	* xfixes/Makefile.am:
	Make building (almost) work with automake 1.4 or 1.7.
	The dist-bzip2 option needs help still.


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/dix/Makefile.am,v
retrieving revision 3.7
retrieving revision 3.7.2.1
diff -u -d -r3.7 -r3.7.2.1
--- Makefile.am	1 Oct 2003 06:43:50 -0000	3.7
+++ Makefile.am	25 Oct 2003 06:10:47 -0000	3.7.2.1
@@ -1,5 +1,5 @@
 INCLUDES = 			\
-	$(XSERVER_CFLAGS)
+	@XSERVER_CFLAGS@
 
 noinst_LIBRARIES = libdix.a libxpstubs.a