radeon: move bof.[ch] out of libdrm_radeon

The functions(files) are used if one explicitly modifies radeon_cs_gem.c
by setting CS_BOF_DUMP to 1. As bof.[ch] is used (copied) to other
out-of-tree projects, keep them around in the distribution tarball.

Cc: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

diff --git a/radeon/Makefile.am b/radeon/Makefile.am
index 5cca394..1e4c869 100644 (file)
--- a/radeon/Makefile.am
+++ b/radeon/Makefile.am
@@ -44,4 +44,4 @@ libdrm_radeoninclude_HEADERS = $(LIBDRM_RADEON_H_FILES)
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = libdrm_radeon.pc
 
-EXTRA_DIST = Android.mk
+EXTRA_DIST = Android.mk $(LIBDRM_RADEON_BOF_FILES)

diff --git a/radeon/Makefile.sources b/radeon/Makefile.sources
index a17701a..1cf482a 100644 (file)
--- a/radeon/Makefile.sources
+++ b/radeon/Makefile.sources
@@ -4,9 +4,7 @@ LIBDRM_RADEON_FILES := \
        radeon_cs_space.c \
        radeon_bo.c \
        radeon_cs.c \
-       radeon_surface.c \
-       bof.c \
-       bof.h
+       radeon_surface.c
 
 LIBDRM_RADEON_H_FILES := \
        radeon_bo.h \
@@ -17,3 +15,7 @@ LIBDRM_RADEON_H_FILES := \
        radeon_bo_int.h \
        radeon_cs_int.h \
        r600_pci_ids.h
+
+LIBDRM_RADEON_BOF_FILES := \
+       bof.c \
+       bof.h

diff --git a/radeon/radeon_cs_gem.c b/radeon/radeon_cs_gem.c
index 705ee05..81b3184 100644 (file)
--- a/radeon/radeon_cs_gem.c
+++ b/radeon/radeon_cs_gem.c
@@ -48,9 +48,12 @@
 #include "xf86drm.h"
 #include "xf86atomic.h"
 #include "radeon_drm.h"
-#include "bof.h"
 
+/* Add LIBDRM_RADEON_BOF_FILES to libdrm_radeon_la_SOURCES when building with BOF_DUMP */
 #define CS_BOF_DUMP 0
+#if CS_BOF_DUMP
+#include "bof.h"
+#endif
 
 struct radeon_cs_manager_gem {
     struct radeon_cs_manager    base;