[xserver-commit] xserver/Xext Makefile.am,3.5,3.5.2.1

[Keith Packard]

Committed by: keithp

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

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/Xext/Makefile.am,v
retrieving revision 3.5
retrieving revision 3.5.2.1
diff -u -d -r3.5 -r3.5.2.1
--- Makefile.am	4 Oct 2003 02:43:16 -0000	3.5
+++ Makefile.am	25 Oct 2003 06:10:47 -0000	3.5.2.1
@@ -1,32 +1,36 @@
 INCLUDES = 					\
 	-I$(top_srcdir)/include			\
-	$(XSERVER_CFLAGS)
+	@XSERVER_CFLAGS@
 
 noinst_LIBRARIES = libXext.a
 
-libXext_a_SOURCES =	\
-	bigreq.c	\
-	mitmisc.c	\
-	shape.c		\
-	sleepuntil.c	\
-	sync.c		\
-	xtest.c		\
-	xtest1di.c	\
-	xtest1dd.c	\
-	xcmisc.c
-
 if MITSHM
-libXext_a_SOURCES += shm.c
+MITSHM_SRCS = shm.c
 endif
 
 if XV
-libXext_a_SOURCES += xvmain.c xvdisp.c xvmc.c
+XV_SRCS = xvmain.c xvdisp.c xvmc.c
 endif
 
 if RES
-libXext_a_SOURCES += xres.c
+RES_SRCS = xres.c
 endif
 
 if SCREENSAVER
-libXext_a_SOURCES += saver.c
+SCREENSAVER_SRCS = saver.c
 endif
+
+libXext_a_SOURCES =		\
+	bigreq.c		\
+	mitmisc.c		\
+	shape.c			\
+	sleepuntil.c		\
+	sync.c			\
+	xtest.c			\
+	xtest1di.c		\
+	xtest1dd.c		\
+	xcmisc.c		\
+	$(MITSHM_SRCS)		\
+	$(XV_SRCS)		\
+	$(RES_SRCS)		\
+	$(SCREENSAVER_SRCS)