From: Tom Stellard <tstel...@gmail.com>
---
configure.ac | 1 +
src/gallium/winsys/radeon/drm/.gitignore | 1 +
src/gallium/winsys/radeon/drm/Makefile | 15 ---------------
src/gallium/winsys/radeon/drm/Makefile.am | 15 +++++++++++++++
4 files changed, 17 insertions(+), 15 deletions(-)
create mode 100644 src/gallium/winsys/radeon/drm/.gitignore
delete mode 100644 src/gallium/winsys/radeon/drm/Makefile
create mode 100644 src/gallium/winsys/radeon/drm/Makefile.am
diff --git a/configure.ac b/configure.ac
index 1c5165f..efea65f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2023,6 +2023,7 @@ AC_CONFIG_FILES([configs/current
src/gallium/targets/Makefile
src/gallium/targets/opencl/Makefile
src/gallium/winsys/Makefile
+ src/gallium/winsys/radeon/drm/Makefile
src/gbm/Makefile
src/gbm/main/gbm.pc
src/glsl/Makefile
diff --git a/src/gallium/winsys/radeon/drm/.gitignore
b/src/gallium/winsys/radeon/drm/.gitignore
new file mode 100644
index 0000000..f3c7a7c
--- /dev/null
+++ b/src/gallium/winsys/radeon/drm/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/winsys/radeon/drm/Makefile
b/src/gallium/winsys/radeon/drm/Makefile
deleted file mode 100644
index 517360e..0000000
--- a/src/gallium/winsys/radeon/drm/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-LIBNAME = radeonwinsys
-
-# get C_SOURCES
-include Makefile.sources
-
-LIBRARY_INCLUDES = -I$(TOP)/include \
- $(shell $(PKG_CONFIG) libdrm --cflags-only-I)
-
-include ../../../Makefile.template
-
-symlinks:
diff --git a/src/gallium/winsys/radeon/drm/Makefile.am
b/src/gallium/winsys/radeon/drm/Makefile.am
new file mode 100644
index 0000000..9b3d47b
--- /dev/null
+++ b/src/gallium/winsys/radeon/drm/Makefile.am
@@ -0,0 +1,15 @@
+include Makefile.sources
+include $(top_srcdir)/src/gallium/Automake.inc
+
+noinst_LTLIBRARIES = libradeonwinsys.la
+
+libradeonwinsys_la_CFLAGS = \
+ -I$(top_srcdir)/include \
+ $(GALLIUM_CFLAGS) \
+ $(RADEON_CFLAGS)
+
+libradeonwinsys_la_SOURCES = $(C_SOURCES)
+
+#XXX: Delete this when all targets using the radeon winsys are converted to
automake.
+all-local: libradeonwinsys.la
+ ln -f $(builddir)/.libs/libradeonwinsys.a $(builddir)/libradeonwinsys.a
--
1.7.8.6
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
