---
configure.ac | 1 +
src/gallium/drivers/nv50/.gitignore | 1 +
src/gallium/drivers/nv50/Makefile | 12 ------------
src/gallium/drivers/nv50/Makefile.am | 14 ++++++++++++++
4 files changed, 16 insertions(+), 12 deletions(-)
create mode 100644 src/gallium/drivers/nv50/.gitignore
delete mode 100644 src/gallium/drivers/nv50/Makefile
create mode 100644 src/gallium/drivers/nv50/Makefile.am
diff --git a/configure.ac b/configure.ac
index 7b923ef..2816cad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2023,6 +2023,7 @@ AC_CONFIG_FILES([configs/current
src/gallium/drivers/llvmpipe/Makefile
src/gallium/drivers/nouveau/Makefile
src/gallium/drivers/nv30/Makefile
+ src/gallium/drivers/nv50/Makefile
src/gallium/drivers/r300/Makefile
src/gallium/drivers/r600/Makefile
src/gallium/drivers/rbug/Makefile
diff --git a/src/gallium/drivers/nv50/.gitignore
b/src/gallium/drivers/nv50/.gitignore
new file mode 100644
index 0000000..f3c7a7c
--- /dev/null
+++ b/src/gallium/drivers/nv50/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/drivers/nv50/Makefile
b/src/gallium/drivers/nv50/Makefile
deleted file mode 100644
index 18e30b0..0000000
--- a/src/gallium/drivers/nv50/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-LIBNAME = nv50
-
-# get C/CPP_SOURCES
-include Makefile.sources
-
-LIBRARY_INCLUDES = \
- $(LIBDRM_CFLAGS)
-
-include ../../Makefile.template
diff --git a/src/gallium/drivers/nv50/Makefile.am
b/src/gallium/drivers/nv50/Makefile.am
new file mode 100644
index 0000000..658a3d0
--- /dev/null
+++ b/src/gallium/drivers/nv50/Makefile.am
@@ -0,0 +1,14 @@
+include Makefile.sources
+include $(top_srcdir)/src/gallium/Automake.inc
+
+noinst_LTLIBRARIES = libnv50.la
+
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/gallium/drivers \
+ -I$(top_srcdir)/include \
+ $(GALLIUM_CFLAGS)
+
+libnv50_la_SOURCES = $(C_SOURCES) $(CPP_SOURCES)
+
+all-local: libnv50.la
+ ln -f $(builddir)/.libs/libnv50.a $(builddir)/libnv50.a
--
1.7.8.6
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
