[Mesa-dev] [PATCH 17/32] nv30: Convert to automake

Matt Turner mattst88 at gmail.com
Wed Aug 29 23:17:09 PDT 2012


---
 configure.ac                         |    1 +
 src/gallium/drivers/nv30/.gitignore  |    1 +
 src/gallium/drivers/nv30/Makefile    |   12 ------------
 src/gallium/drivers/nv30/Makefile.am |   14 ++++++++++++++
 4 files changed, 16 insertions(+), 12 deletions(-)
 create mode 100644 src/gallium/drivers/nv30/.gitignore
 delete mode 100644 src/gallium/drivers/nv30/Makefile
 create mode 100644 src/gallium/drivers/nv30/Makefile.am

diff --git a/configure.ac b/configure.ac
index a09b6f7..7b923ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2022,6 +2022,7 @@ AC_CONFIG_FILES([configs/current
 		src/gallium/drivers/i915/Makefile
 		src/gallium/drivers/llvmpipe/Makefile
 		src/gallium/drivers/nouveau/Makefile
+		src/gallium/drivers/nv30/Makefile
 		src/gallium/drivers/r300/Makefile
 		src/gallium/drivers/r600/Makefile
 		src/gallium/drivers/rbug/Makefile
diff --git a/src/gallium/drivers/nv30/.gitignore b/src/gallium/drivers/nv30/.gitignore
new file mode 100644
index 0000000..f3c7a7c
--- /dev/null
+++ b/src/gallium/drivers/nv30/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/drivers/nv30/Makefile b/src/gallium/drivers/nv30/Makefile
deleted file mode 100644
index de521aa..0000000
--- a/src/gallium/drivers/nv30/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-LIBNAME = nv30
-
-include Makefile.sources
-
-LIBRARY_INCLUDES = \
-	$(LIBDRM_CFLAGS)
-
-include ../../Makefile.template
-# DO NOT DELETE
diff --git a/src/gallium/drivers/nv30/Makefile.am b/src/gallium/drivers/nv30/Makefile.am
new file mode 100644
index 0000000..c750c32
--- /dev/null
+++ b/src/gallium/drivers/nv30/Makefile.am
@@ -0,0 +1,14 @@
+include Makefile.sources
+include $(top_srcdir)/src/gallium/Automake.inc
+
+noinst_LTLIBRARIES = libnv30.la
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/gallium/drivers \
+	-I$(top_srcdir)/include \
+	$(GALLIUM_CFLAGS)
+
+libnv30_la_SOURCES = $(C_SOURCES)
+
+all-local: libnv30.la
+	ln -f $(builddir)/.libs/libnv30.a $(builddir)/libnv30.a
-- 
1.7.8.6



More information about the mesa-dev mailing list