---
configure.ac | 1 +
src/gallium/winsys/svga/drm/.gitignore | 1 +
src/gallium/winsys/svga/drm/Makefile | 19 -------------------
src/gallium/winsys/svga/drm/Makefile.am | 19 +++++++++++++++++++
4 files changed, 21 insertions(+), 19 deletions(-)
create mode 100644 src/gallium/winsys/svga/drm/.gitignore
delete mode 100644 src/gallium/winsys/svga/drm/Makefile
create mode 100644 src/gallium/winsys/svga/drm/Makefile.am
diff --git a/configure.ac b/configure.ac
index d71b120..1fb1321 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2040,6 +2040,7 @@ AC_CONFIG_FILES([configs/current
src/gallium/winsys/i915/sw/Makefile
src/gallium/winsys/nouveau/drm/Makefile
src/gallium/winsys/radeon/drm/Makefile
+ src/gallium/winsys/svga/drm/Makefile
src/gbm/Makefile
src/gbm/main/gbm.pc
src/glsl/Makefile
diff --git a/src/gallium/winsys/svga/drm/.gitignore
b/src/gallium/winsys/svga/drm/.gitignore
new file mode 100644
index 0000000..f3c7a7c
--- /dev/null
+++ b/src/gallium/winsys/svga/drm/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/winsys/svga/drm/Makefile
b/src/gallium/winsys/svga/drm/Makefile
deleted file mode 100644
index 02ea91b..0000000
--- a/src/gallium/winsys/svga/drm/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-LIBNAME = svgadrm
-
-# get C_SOURCES
-include Makefile.sources
-
-LIBRARY_INCLUDES = \
- -I$(TOP)/src/gallium/drivers/svga \
- -I$(TOP)/src/gallium/drivers/svga/include \
- $(shell $(PKG_CONFIG) libdrm --cflags-only-I)
-
-LIBRARY_DEFINES = \
- -std=gnu99 -fvisibility=hidden \
- -DHAVE_STDINT_H -D_FILE_OFFSET_BITS=64 \
- $(shell $(PKG_CONFIG) libdrm --cflags-only-other)
-
-include ../../../Makefile.template
diff --git a/src/gallium/winsys/svga/drm/Makefile.am
b/src/gallium/winsys/svga/drm/Makefile.am
new file mode 100644
index 0000000..80262cc
--- /dev/null
+++ b/src/gallium/winsys/svga/drm/Makefile.am
@@ -0,0 +1,19 @@
+include Makefile.sources
+include $(top_srcdir)/src/gallium/Automake.inc
+
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/gallium/drivers/svga \
+ -I$(top_srcdir)/src/gallium/drivers/svga/include \
+ -I$(top_srcdir)/include \
+ -I$(top_srcdir)/src/gallium/drivers \
+ $(GALLIUM_CFLAGS) \
+ $(LIBDRM_CFLAGS)
+AM_CFLAGS = -std=gnu99 -D_FILE_OFFSET_BITS=64
+
+noinst_LTLIBRARIES = libsvgadrm.la
+
+libsvgadrm_la_SOURCES = $(C_SOURCES)
+
+#XXX: Delete this when all targets using the svga winsys are converted to
automake.
+all-local: libsvgadrm.la
+ ln -f $(builddir)/.libs/libsvgadrm.a $(builddir)/libsvgadrm.a
--
1.7.8.6
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
