2 files changed, 0 insertions, 185 deletions
diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
deleted file mode 100644
index d7d803a961c..00000000000
--- a/src/gallium/auxiliary/Makefile.am
+++ /dev/null
@@ -1,134 +0,0 @@
-include Makefile.sources
-include $(top_srcdir)/src/gallium/Automake.inc
-
-noinst_LTLIBRARIES = libgallium.la
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/src/loader \
-	-I$(top_builddir)/src/compiler/nir \
-	-I$(top_srcdir)/src/gallium/auxiliary/util \
-	$(GALLIUM_CFLAGS) \
-	$(LIBUNWIND_CFLAGS) \
-	$(VISIBILITY_CFLAGS) \
-	$(MSVC2013_COMPAT_CFLAGS)
-
-AM_CXXFLAGS = \
-	$(GALLIUM_CFLAGS) \
-	$(VISIBILITY_CXXFLAGS) \
-	$(MSVC2013_COMPAT_CXXFLAGS)
-
-libgallium_la_SOURCES = \
-	$(C_SOURCES) \
-	$(NIR_SOURCES) \
-	$(GENERATED_SOURCES)
-
-if HAVE_PLATFORM_ANDROID
-# Android's libbacktrace headers required C++11, but the Android toolchain (at
-# least in the Chrome OS SDK) does not enable C++11 by default.
-AM_CXXFLAGS += $(CXX11_CXXFLAGS)
-
-libgallium_la_SOURCES += util/u_debug_stack_android.cpp
-endif
-
-if HAVE_LIBDRM
-
-AM_CFLAGS += \
-	$(LIBDRM_CFLAGS)
-
-libgallium_la_SOURCES += \
-	$(RENDERONLY_SOURCES)
-
-endif
-
-if HAVE_GALLIUM_LLVM
-
-AM_CFLAGS += \
-	$(LLVM_CFLAGS)
-
-AM_CXXFLAGS += \
-	$(LLVM_CXXFLAGS)
-
-libgallium_la_SOURCES += \
-	$(GALLIVM_SOURCES)
-
-endif
-
-MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
-PYTHON_GEN =  $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
-
-indices/u_indices_gen.c: indices/u_indices_gen.py
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/indices/u_indices_gen.py > $@
-
-indices/u_unfilled_gen.c: indices/u_unfilled_gen.py
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/indices/u_unfilled_gen.py > $@
-
-util/u_format_table.c: util/u_format_table.py \
-                       util/u_format_pack.py \
-                       util/u_format_parse.py \
-                       util/u_format.csv
-	$(MKDIR_GEN)
-	$(PYTHON_GEN) $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format.csv > $@
-
-noinst_LTLIBRARIES += libgalliumvl_stub.la
-libgalliumvl_stub_la_SOURCES = \
-	$(VL_STUB_SOURCES)
-
-if NEED_GALLIUM_VL
-
-COMMON_VL_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(VL_CFLAGS) \
-	$(XCB_DRI3_CFLAGS) \
-	$(DRI2PROTO_CFLAGS) \
-	$(LIBDRM_CFLAGS)
-
-noinst_LTLIBRARIES += libgalliumvl.la
-
-libgalliumvl_la_CFLAGS = \
-	$(COMMON_VL_CFLAGS)
-
-libgalliumvl_la_SOURCES = \
-	$(VL_SOURCES)
-
-if NEED_GALLIUM_VL_WINSYS
-
-noinst_LTLIBRARIES += libgalliumvlwinsys.la
-
-libgalliumvlwinsys_la_CFLAGS = $(COMMON_VL_CFLAGS)
-libgalliumvlwinsys_la_SOURCES = $(VL_WINSYS_SOURCES)
-
-if HAVE_PLATFORM_X11
-libgalliumvlwinsys_la_SOURCES += $(VL_WINSYS_DRI2_SOURCES)
-
-if HAVE_DRI3
-libgalliumvlwinsys_la_SOURCES += $(VL_WINSYS_DRI3_SOURCES)
-endif
-endif
-
-if HAVE_PLATFORM_DRM
-libgalliumvlwinsys_la_SOURCES += $(VL_WINSYS_DRM_SOURCES)
-endif
-
-endif # NEED_GALLIUM_VL_WINSYS
-endif # NEED_GALLIUM_VL
-
-EXTRA_DIST = \
-	SConscript \
-	driver_rbug/README \
-	driver_trace/README \
-	driver_trace/trace.xsl \
-	indices/u_indices.c \
-	indices/u_unfilled_indices.c \
-	indices/u_indices_gen.py \
-	indices/u_unfilled_gen.py \
-	postprocess/ADDING \
-	rbug/README \
-	target-helpers \
-	util/u_debug_stack_android.cpp \
-	util/u_format.csv \
-	util/u_format_pack.py \
-	util/u_format_parse.py \
-	util/u_format_table.py \
-	meson.build
diff --git a/src/gallium/auxiliary/pipe-loader/Makefile.am b/src/gallium/auxiliary/pipe-loader/Makefile.am
deleted file mode 100644
index 718e5afad63..00000000000
--- a/src/gallium/auxiliary/pipe-loader/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-include Makefile.sources
-include $(top_srcdir)/src/gallium/Automake.inc
-
-# XXX: check if we need the gallium/winsys include
-AM_CFLAGS = \
-	-I$(top_srcdir)/src/loader \
-	-I$(top_srcdir)/src/gallium/winsys \
-	-I$(top_builddir)/src/util \
-	$(GALLIUM_PIPE_LOADER_DEFINES) \
-	$(GALLIUM_CFLAGS) \
-	$(VISIBILITY_CFLAGS)
-
-noinst_LTLIBRARIES = \
-	libpipe_loader_static.la \
-	libpipe_loader_dynamic.la
-
-libpipe_loader_static_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	-DGALLIUM_STATIC_TARGETS=1
-
-libpipe_loader_dynamic_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	-DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\"
-
-libpipe_loader_static_la_SOURCES = \
-	$(COMMON_SOURCES)
-
-libpipe_loader_dynamic_la_SOURCES = \
-	$(COMMON_SOURCES)
-
-if HAVE_LIBDRM
-AM_CFLAGS += \
-	$(LIBDRM_CFLAGS)
-
-libpipe_loader_static_la_SOURCES += \
-	$(DRM_SOURCES)
-
-libpipe_loader_dynamic_la_SOURCES += \
-	$(DRM_SOURCES)
-
-endif
-
-libpipe_loader_static_la_LIBADD = \
-	$(top_builddir)/src/loader/libloader.la \
-	$(top_builddir)/src/util/libxmlconfig.la
-
-libpipe_loader_dynamic_la_LIBADD = \
-	$(top_builddir)/src/loader/libloader.la \
-	$(top_builddir)/src/util/libxmlconfig.la
-
-EXTRA_DIST = SConscript meson.build