summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@canonical.com>2013-06-12 10:30:32 +0200
committerMaarten Lankhorst <maarten.lankhorst@canonical.com>2013-06-12 10:30:32 +0200
commit3b1a45325d5fd46f0e7fad17168742b4c9a2465a (patch)
tree11a265678a2d4a057aeb021d937381c1b0679afc
parentb82aacd3e72b52240181569c8b0abb55c1f716d5 (diff)
downloadxorg-driver-xf86-video-nouveau-3b1a45325d5fd46f0e7fad17168742b4c9a2465a.tar.gz
update makefiles for make distcheck
-rw-r--r--.gitignore1
-rw-r--r--Makefile.am15
-rw-r--r--src/Makefile.am33
-rw-r--r--src/shader/.gitignore1
4 files changed, 44 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index 4ff1108..186b1c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ ltmain.sh
missing
stamp-h1
ChangeLog
+INSTALL
diff --git a/Makefile.am b/Makefile.am
index 011c574..032be8a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,11 +20,14 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
+MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = ChangeLog
+.PHONY: ChangeLog INSTALL
-# Always regenerate the changelog
-CLEANFILES = ChangeLog
-ChangeLog: FORCE
- git log > ChangeLog
-FORCE:
+INSTALL:
+ $(INSTALL_CMD)
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+EXTRA_DIST = ChangeLog INSTALL
diff --git a/src/Makefile.am b/src/Makefile.am
index 17c6389..f54e135 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -66,6 +66,39 @@ EXTRA_DIST = hwdefs/nv_3ddefs.xml.h \
hwdefs/nv50_texture.h \
hwdefs/nvc0_3d.xml.h \
hwdefs/nvc0_m2mf.xml.h \
+ shader/exac8nvc0.fp \
+ shader/exac8nvc0.fpc \
+ shader/exac8nve0.fp \
+ shader/exac8nve0.fpc \
+ shader/exacanvc0.fp \
+ shader/exacanvc0.fpc \
+ shader/exacanve0.fp \
+ shader/exacanve0.fpc \
+ shader/exacmnvc0.fp \
+ shader/exacmnvc0.fpc \
+ shader/exacmnve0.fp \
+ shader/exacmnve0.fpc \
+ shader/exas8nvc0.fp \
+ shader/exas8nvc0.fpc \
+ shader/exas8nve0.fp \
+ shader/exas8nve0.fpc \
+ shader/exasanvc0.fp \
+ shader/exasanvc0.fpc \
+ shader/exasanve0.fp \
+ shader/exasanve0.fpc \
+ shader/exascnvc0.fp \
+ shader/exascnvc0.fpc \
+ shader/exascnve0.fp \
+ shader/exascnve0.fpc \
+ shader/videonvc0.fp \
+ shader/videonvc0.fpc \
+ shader/videonve0.fp \
+ shader/videonve0.fpc \
+ shader/xfrm2nvc0.vp \
+ shader/xfrm2nvc0.vpc \
+ shader/xfrm2nve0.vp \
+ shader/xfrm2nve0.vpc \
+ shader/Makefile \
nouveau_local.h \
nv_const.h \
nv_dma.h \
diff --git a/src/shader/.gitignore b/src/shader/.gitignore
new file mode 100644
index 0000000..2460008
--- /dev/null
+++ b/src/shader/.gitignore
@@ -0,0 +1 @@
+!Makefile