Revert "gallium: build ddebug, noop, rbug, trace as part of auxiliary"

This reverts commit 6f82b8d8d0a986aac28e7bec47fc313fb950475c.

This broke scons build, and reportedly clover with autotools/meson too.

2 files changed, 27 insertions, 9 deletions

diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
index 7af3f3ce42a..95a325f96b3 100644
--- a/src/gallium/auxiliary/Makefile.am
+++ b/src/gallium/auxiliary/Makefile.am
@@ -1,8 +1,4 @@
 include Makefile.sources
-include $(top_srcdir)/src/gallium/drivers/ddebug/Makefile.sources
-include $(top_srcdir)/src/gallium/drivers/noop/Makefile.sources
-include $(top_srcdir)/src/gallium/drivers/rbug/Makefile.sources
-include $(top_srcdir)/src/gallium/drivers/trace/Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
 noinst_LTLIBRARIES = libgallium.la
@@ -23,11 +19,7 @@ AM_CXXFLAGS = \
 libgallium_la_SOURCES = \
 	$(C_SOURCES) \
 	$(NIR_SOURCES) \
-	$(GENERATED_SOURCES) \
-	$(DDEBUG_SOURCES) \
-	$(NOOP_SOURCES) \
-	$(RBUG_SOURCES) \
-	$(TRACE_SOURCES)
+	$(GENERATED_SOURCES)
 
 if HAVE_LIBDRM
 
diff --git a/src/gallium/auxiliary/target-helpers/inline_debug_helper.h b/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
index 85563769408..2443bf21468 100644
--- a/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
+++ b/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
@@ -11,18 +11,44 @@
  * one or more debug driver: rbug, trace.
  */
 
+#ifdef GALLIUM_DDEBUG
 #include "ddebug/dd_public.h"
+#endif
+
+#ifdef GALLIUM_TRACE
 #include "trace/tr_public.h"
+#endif
+
+#ifdef GALLIUM_RBUG
 #include "rbug/rbug_public.h"
+#endif
+
+#ifdef GALLIUM_NOOP
 #include "noop/noop_public.h"
+#endif
 
+/*
+ * TODO: Audit the following *screen_create() - all of
+ * them should return the original screen on failuire.
+ */
 static inline struct pipe_screen *
 debug_screen_wrap(struct pipe_screen *screen)
 {
+#if defined(GALLIUM_DDEBUG)
    screen = ddebug_screen_create(screen);
+#endif
+
+#if defined(GALLIUM_RBUG)
    screen = rbug_screen_create(screen);
+#endif
+
+#if defined(GALLIUM_TRACE)
    screen = trace_screen_create(screen);
+#endif
+
+#if defined(GALLIUM_NOOP)
    screen = noop_screen_create(screen);
+#endif
 
    if (debug_get_bool_option("GALLIUM_TESTS", FALSE))
       util_run_tests(screen);