[xserver-commit] xserver/hw/xnest Makefile.am,3.4.2.2,3.4.2.3

[Keith Packard]

Committed by: keithp

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

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/hw/xnest/Makefile.am,v
retrieving revision 3.4.2.2
retrieving revision 3.4.2.3
diff -u -d -r3.4.2.2 -r3.4.2.3
--- Makefile.am	24 Oct 2003 06:35:24 -0000	3.4.2.2
+++ Makefile.am	25 Oct 2003 06:10:48 -0000	3.4.2.3
@@ -1,7 +1,7 @@
 INCLUDES = 					\
 	@XNEST_INCS@				\
-	$(XSERVER_CFLAGS)			\
-	$(XNESTSERVER_CFLAGS)
+	@XNESTSERVER_CFLAGS@			\
+	@XSERVER_CFLAGS@
 
 bin_PROGRAMS = Xnest
 
@@ -30,4 +30,9 @@
 Xnest_LDADD = \
 	libxnest.a					\
 	@XNEST_LIBS@					\
-	$(XNESTSERVER_LIBS)
+	@XNESTSERVER_LIBS@				\
+	@XSERVER_LIBS@
+
+Xnest_DEPENDENCIES =					\
+	libxnest.a					\
+	@XNEST_LIBS@