xf86-video-intel: Branch 'modesetting' - src/Makefile.am

Daniel Stone daniels at kemper.freedesktop.org
Fri Feb 9 16:20:57 EET 2007


 src/Makefile.am |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

New commits:
diff-tree 98318dfcc99264fb7b7ef34568712812aa6300b6 (from fce4390c4f1a76c65423114bb479814787612cd7)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Fri Feb 9 16:20:57 2007 +0200

    add missing files to fix distcheck
    A bunch of files were missing from _SOURCES, and the build was also broken
    for missing files (from EXTRA_DIST) when building without gen4asm.

diff --git a/src/Makefile.am b/src/Makefile.am
index f824a74..6c63cc4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -94,7 +94,16 @@ intel_drv_la_SOURCES = \
 	 i830_xaa.c \
 	 i830_render.c \
 	 i915_render.c \
-	 i965_render.c
+	 i965_render.c \
+	 i830_xf86Rename.h \
+	 local_xf86Rename.h \
+	 xf86Parser.h \
+	 xf86Optrec.h \
+	 i830_randr.h
+
+EXTRA_DIST = \
+	packed_yuv_sf.g4a \
+	packed_yuv_wm.g4a
 
 if HAVE_GEN4ASM
 sf_prog.h: packed_yuv_sf.g4a
@@ -109,6 +118,14 @@ exa_wm_nomask_prog.h: exa_wm_nomask.g4a
 	intel-gen4asm -o exa_wm_nomask_prog.h exa_wm_nomask.g4a
 exa_wm_masknoca_prog.h: exa_wm_masknoca.g4a
 	intel-gen4asm -o exa_wm_masknoca_prog.h exa_wm_masknoca.g4a
+else
+EXTRA_DIST += \
+	sf_prog.h		\
+	wm_prog.h 		\
+	exa_sf_prog.h 		\
+	exa_sf_mask_prog.h	\
+	exa_wm_nomask_prog.h 	\
+	exa_wm_masknoca_prog.h
 endif
 
 if DRI
@@ -120,10 +137,6 @@ intel_drv_la_SOURCES += \
          i830_dri.h 
 endif
 
-EXTRA_DIST = \
-	packed_yuv_sf.g4a \
-	packed_yuv_wm.g4a
-
 install-data-local: install-intel_drv_laLTLIBRARIES
 	(cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so && ln -s intel_drv.so i810_drv.so)
 



More information about the xorg-commit mailing list