[Mesa-dev] =?j?q?=5BPATCH=203/4=5D=20nv50=3A=20use=20automake=20to=20generate=20Makefile?=

[Lucas Stach]

---
 configure.ac                         |  1 +
 src/gallium/drivers/nv50/Makefile    | 12 ------------
 src/gallium/drivers/nv50/Makefile.am | 25 +++++++++++++++++++++++++
 3 Dateien geändert, 26 Zeilen hinzugefügt(+), 12 Zeilen entfernt(-)
 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 59b4b68..aa20393 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2131,6 +2131,7 @@ AC_CONFIG_FILES([configs/current
 		src/gallium/drivers/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/targets/opencl/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..bdef611
--- /dev/null
+++ b/src/gallium/drivers/nv50/Makefile.am
@@ -0,0 +1,25 @@
+include Makefile.sources
+
+noinst_LIBRARIES = libnv50.a
+
+AM_CFLAGS = \
+	-I$(top_srcdir)/src/gallium/include \
+	-I$(top_srcdir)/src/gallium/auxiliary \
+	-I$(top_srcdir)/src/gallium/drivers \
+	-I$(top_srcdir)/include \
+	$(NOUVEAU_CFLAGS) \
+	$(DEFINES) \
+	$(PIC_FLAGS) \
+	$(VISIBILITY_CFLAGS)
+	
+AM_CXXFLAGS = \
+	-I$(top_srcdir)/src/gallium/include \
+	-I$(top_srcdir)/src/gallium/auxiliary \
+	-I$(top_srcdir)/src/gallium/drivers \
+	$(DEFINES) \
+	$(PIC_FLAGS) \
+	$(VISIBILITY_CFLAGS)
+
+libnv50_a_SOURCES = \
+	$(C_SOURCES) \
+	$(CPP_SOURCES)
\ No newline at end of file
-- 
1.7.11.2