util: move u_cpu_detect to util

[mesa.git] / src / gallium / auxiliary / Makefile.am

diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
index 670e1248de92e95a7a247286c6635ebd045e3e1c..4bfa7648389ced6bebb97048942127eea6a72bb6 100644 (file)
--- a/src/gallium/auxiliary/Makefile.am
+++ b/src/gallium/auxiliary/Makefile.am
@@ -1,54 +1,134 @@
-AUTOMAKE_OPTIONS = subdir-objects
-
 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) \
-       $(VISIBILITY_CFLAGS)
+       $(LIBUNWIND_CFLAGS) \
+       $(VISIBILITY_CFLAGS) \
+       $(MSVC2013_COMPAT_CFLAGS)
 
-AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
+AM_CXXFLAGS = \
+       $(GALLIUM_CFLAGS) \
+       $(VISIBILITY_CXXFLAGS) \
+       $(MSVC2013_COMPAT_CXXFLAGS)
 
 libgallium_la_SOURCES = \
        $(C_SOURCES) \
+       $(NIR_SOURCES) \
        $(GENERATED_SOURCES)
 
-if HAVE_MESA_LLVM
+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 += \
-       $(GALLIUM_CFLAGS) \
        $(LLVM_CXXFLAGS)
 
-if LLVM_NEEDS_FNORTTI
-
-AM_CXXFLAGS += -fno-rtti
+libgallium_la_SOURCES += \
+       $(GALLIVM_SOURCES)
 
 endif
 
-libgallium_la_SOURCES += \
-       $(GALLIVM_SOURCES) \
-       $(GALLIVM_CPP_SOURCES)
+MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
+PYTHON_GEN =  $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
 
-endif
+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)
 
-indices/u_indices_gen.c: $(srcdir)/indices/u_indices_gen.py
-       $(MKDIR_P) indices
-       $(AM_V_GEN) $(PYTHON2) $< > $@
+libgalliumvl_la_SOURCES = \
+       $(VL_SOURCES)
 
-indices/u_unfilled_gen.c: $(srcdir)/indices/u_unfilled_gen.py
-       $(MKDIR_P) indices
-       $(AM_V_GEN) $(PYTHON2) $< > $@
+if NEED_GALLIUM_VL_WINSYS
 
-util/u_format_srgb.c: $(srcdir)/util/u_format_srgb.py
-       $(MKDIR_P) util
-       $(AM_V_GEN) $(PYTHON2) $< > $@
+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
 
-util/u_format_table.c: $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format_pack.py $(srcdir)/util/u_format_parse.py $(srcdir)/util/u_format.csv
-       $(MKDIR_P) util
-       $(AM_V_GEN) $(PYTHON2) $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format.csv > $@
+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