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

[Lucas Stach]

---
 configure.ac                            |  1 +
 src/gallium/drivers/nouveau/Makefile    | 16 ----------------
 src/gallium/drivers/nouveau/Makefile.am | 16 ++++++++++++++++
 3 Dateien geändert, 17 Zeilen hinzugefügt(+), 16 Zeilen entfernt(-)
 delete mode 100644 src/gallium/drivers/nouveau/Makefile
 create mode 100644 src/gallium/drivers/nouveau/Makefile.am

diff --git a/configure.ac b/configure.ac
index b6481a6..d1fc0f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2129,6 +2129,7 @@ AC_CONFIG_FILES([configs/current
 		src/gallium/auxiliary/pipe-loader/Makefile
 		src/gallium/state_trackers/clover/Makefile
 		src/gallium/drivers/Makefile
+		src/gallium/drivers/nouveau/Makefile
 		src/gallium/drivers/r300/Makefile
 		src/gallium/drivers/r600/Makefile
 		src/gallium/targets/opencl/Makefile
diff --git a/src/gallium/drivers/nouveau/Makefile b/src/gallium/drivers/nouveau/Makefile
deleted file mode 100644
index d583324..0000000
--- a/src/gallium/drivers/nouveau/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-LIBNAME = nouveau
-
-LIBRARY_INCLUDES = \
-	$(LIBDRM_CFLAGS) \
-	-I$(TOP)/src/gallium/drivers/nouveau/include
-
-LIBRARY_INCLUDES += $(shell $(PKG_CONFIG) libdrm libdrm_nouveau --cflags-only-I)
-LIBRARY_DEFINES += $(shell $(PKG_CONFIG) libdrm libdrm_nouveau --cflags-only-other)
-
-# get C_SOURCES
-include Makefile.sources
-
-include ../../Makefile.template
diff --git a/src/gallium/drivers/nouveau/Makefile.am b/src/gallium/drivers/nouveau/Makefile.am
new file mode 100644
index 0000000..dd4a767
--- /dev/null
+++ b/src/gallium/drivers/nouveau/Makefile.am
@@ -0,0 +1,16 @@
+include Makefile.sources
+
+noinst_LIBRARIES = libnouveau.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)
+
+libnouveau_a_SOURCES = \
+	$(C_SOURCES)
\ No newline at end of file
-- 
1.7.11.2