---
configure.ac | 1 +
src/gallium/drivers/nouveau/.gitignore | 1 +
src/gallium/drivers/nouveau/Makefile | 16 ----------------
src/gallium/drivers/nouveau/Makefile.am | 16 ++++++++++++++++
4 files changed, 18 insertions(+), 16 deletions(-)
create mode 100644 src/gallium/drivers/nouveau/.gitignore
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 d410e5c..a09b6f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2021,6 +2021,7 @@ AC_CONFIG_FILES([configs/current
src/gallium/drivers/Makefile
src/gallium/drivers/i915/Makefile
src/gallium/drivers/llvmpipe/Makefile
+ src/gallium/drivers/nouveau/Makefile
src/gallium/drivers/r300/Makefile
src/gallium/drivers/r600/Makefile
src/gallium/drivers/rbug/Makefile
diff --git a/src/gallium/drivers/nouveau/.gitignore
b/src/gallium/drivers/nouveau/.gitignore
new file mode 100644
index 0000000..f3c7a7c
--- /dev/null
+++ b/src/gallium/drivers/nouveau/.gitignore
@@ -0,0 +1 @@
+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..2a75875
--- /dev/null
+++ b/src/gallium/drivers/nouveau/Makefile.am
@@ -0,0 +1,16 @@
+include Makefile.sources
+include $(top_srcdir)/src/gallium/Automake.inc
+
+noinst_LTLIBRARIES = libnouveau.la
+
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/gallium/drivers/nouveau/include \
+ -I$(top_srcdir)/src/gallium/drivers \
+ -I$(top_srcdir)/include \
+ $(GALLIUM_CFLAGS) \
+ $(LIBDRM_CFLAGS)
+
+libnouveau_la_SOURCES = $(C_SOURCES)
+
+all-local: libnouveau.la
+ ln -f $(builddir)/.libs/libnouveau.a $(builddir)/libnouveau.a
--
1.7.8.6
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
