---
configure.ac | 1 +
src/gallium/state_trackers/dri/drm/.gitignore | 1 +
src/gallium/state_trackers/dri/drm/Makefile | 27 ------------------------
src/gallium/state_trackers/dri/drm/Makefile.am | 20 +++++++++++++++++
4 files changed, 22 insertions(+), 27 deletions(-)
create mode 100644 src/gallium/state_trackers/dri/drm/.gitignore
delete mode 100644 src/gallium/state_trackers/dri/drm/Makefile
create mode 100644 src/gallium/state_trackers/dri/drm/Makefile.am
diff --git a/configure.ac b/configure.ac
index a6a13e4..11fc849 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2034,6 +2034,7 @@ AC_CONFIG_FILES([configs/current
src/gallium/drivers/trace/Makefile
src/gallium/state_trackers/clover/Makefile
src/gallium/state_trackers/dri/Makefile
+ src/gallium/state_trackers/dri/drm/Makefile
src/gallium/targets/Makefile
src/gallium/targets/opencl/Makefile
src/gallium/winsys/Makefile
diff --git a/src/gallium/state_trackers/dri/drm/.gitignore
b/src/gallium/state_trackers/dri/drm/.gitignore
new file mode 100644
index 0000000..f3c7a7c
--- /dev/null
+++ b/src/gallium/state_trackers/dri/drm/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/state_trackers/dri/drm/Makefile
b/src/gallium/state_trackers/dri/drm/Makefile
deleted file mode 100644
index 0eeeb9d..0000000
--- a/src/gallium/state_trackers/dri/drm/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-LIBNAME = dridrm
-
-LIBRARY_INCLUDES = \
- -I$(TOP)/include \
- -I$(TOP)/src/mapi \
- -I$(TOP)/src/mesa \
- -I$(TOP)/src/gallium/state_trackers/dri/common \
- -I$(TOP)/src/mesa/drivers/dri/common \
- -I$(TOP)/src/mesa/main \
- $(shell $(PKG_CONFIG) --cflags-only-I libdrm)
-
-
-C_SOURCES = \
- dri_context.c \
- dri_screen.c \
- dri_drawable.c \
- dri2.c
-
-# $(TOP)/src/mesa/drivers/dri/common/utils.c \
- $(TOP)/src/mesa/drivers/dri/common/dri_util.c \
- $(TOP)/src/mesa/drivers/dri/common/xmlconfig.c \
- $(TOP)/src/mesa/drivers/common/driverfuncs.c
-
-include ../../../Makefile.template
diff --git a/src/gallium/state_trackers/dri/drm/Makefile.am
b/src/gallium/state_trackers/dri/drm/Makefile.am
new file mode 100644
index 0000000..8340828
--- /dev/null
+++ b/src/gallium/state_trackers/dri/drm/Makefile.am
@@ -0,0 +1,20 @@
+include $(top_srcdir)/src/gallium/Automake.inc
+
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/mapi \
+ -I$(top_srcdir)/src/mesa \
+ -I$(top_srcdir)/src/gallium/state_trackers/dri/common \
+ -I$(top_srcdir)/src/mesa/drivers/dri/common \
+ $(GALLIUM_CFLAGS) \
+ $(LIBDRM_CFLAGS)
+
+noinst_LTLIBRARIES = libdridrm.la
+
+libdridrm_la_SOURCES = \
+ dri_context.c \
+ dri_screen.c \
+ dri_drawable.c \
+ dri2.c
+
+all-local: libdridrm.la
+ ln -f $(builddir)/.libs/libdridrm.a $(builddir)/libdridrm.a
--
1.7.8.6
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
