---
configure.ac | 1 +
src/gallium/winsys/nouveau/drm/.gitignore | 1 +
src/gallium/winsys/nouveau/drm/Makefile | 11 -----------
src/gallium/winsys/nouveau/drm/Makefile.am | 15 +++++++++++++++
4 files changed, 17 insertions(+), 11 deletions(-)
create mode 100644 src/gallium/winsys/nouveau/drm/.gitignore
delete mode 100644 src/gallium/winsys/nouveau/drm/Makefile
create mode 100644 src/gallium/winsys/nouveau/drm/Makefile.am
diff --git a/configure.ac b/configure.ac
index 9bbe598..d71b120 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2038,6 +2038,7 @@ AC_CONFIG_FILES([configs/current
src/gallium/winsys/Makefile
src/gallium/winsys/i915/drm/Makefile
src/gallium/winsys/i915/sw/Makefile
+ src/gallium/winsys/nouveau/drm/Makefile
src/gallium/winsys/radeon/drm/Makefile
src/gbm/Makefile
src/gbm/main/gbm.pc
diff --git a/src/gallium/winsys/nouveau/drm/.gitignore
b/src/gallium/winsys/nouveau/drm/.gitignore
new file mode 100644
index 0000000..f3c7a7c
--- /dev/null
+++ b/src/gallium/winsys/nouveau/drm/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/winsys/nouveau/drm/Makefile
b/src/gallium/winsys/nouveau/drm/Makefile
deleted file mode 100644
index ed748ac..0000000
--- a/src/gallium/winsys/nouveau/drm/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-LIBNAME = nouveaudrm
-
-C_SOURCES = nouveau_drm_winsys.c
-
-LIBRARY_INCLUDES = $(shell $(PKG_CONFIG) libdrm libdrm_nouveau --cflags-only-I)
-LIBRARY_DEFINES = $(shell $(PKG_CONFIG) libdrm libdrm_nouveau
--cflags-only-other)
-
-include ../../../Makefile.template
diff --git a/src/gallium/winsys/nouveau/drm/Makefile.am
b/src/gallium/winsys/nouveau/drm/Makefile.am
new file mode 100644
index 0000000..8fedbe5
--- /dev/null
+++ b/src/gallium/winsys/nouveau/drm/Makefile.am
@@ -0,0 +1,15 @@
+include $(top_srcdir)/src/gallium/Automake.inc
+
+AM_CFLAGS = \
+ -I$(top_srcdir)/include \
+ -I$(top_srcdir)/src/gallium/drivers \
+ $(GALLIUM_CFLAGS) \
+ $(NOUVEAU_CFLAGS)
+
+noinst_LTLIBRARIES = libnouveaudrm.la
+
+libnouveaudrm_la_SOURCES = nouveau_drm_winsys.c
+
+#XXX: Delete this when all targets using the nouveau winsys are converted to
automake.
+all-local: libnouveaudrm.la
+ ln -f $(builddir)/.libs/libnouveaudrm.a $(builddir)/libnouveaudrm.a
--
1.7.8.6
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
