Revert "gallium/hud: automatically print % if max_value == 100"

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

diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
index 89c7a13e9131e4364ea5242437b18c654a1d4436..4a4a4fb89cfaf75895ce3167c777e84d78af9707 100644 (file)
--- a/src/gallium/auxiliary/Makefile.am
+++ b/src/gallium/auxiliary/Makefile.am
@@ -1,24 +1,19 @@
-AUTOMAKE_OPTIONS = subdir-objects
-
-if HAVE_LOADER_GALLIUM
-SUBDIRS := pipe-loader
-endif
-
 include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
 noinst_LTLIBRARIES = libgallium.la
 
 AM_CFLAGS = \
-       -I$(top_builddir)/src/glsl/nir \
+       -I$(top_srcdir)/src/loader \
+       -I$(top_builddir)/src/compiler/nir \
        -I$(top_srcdir)/src/gallium/auxiliary/util \
        $(GALLIUM_CFLAGS) \
        $(VISIBILITY_CFLAGS) \
-       $(MSVC2008_COMPAT_CXXFLAGS)
+       $(MSVC2013_COMPAT_CFLAGS)
 
 AM_CXXFLAGS = \
        $(VISIBILITY_CXXFLAGS) \
-       $(MSVC2008_COMPAT_CXXFLAGS)
+       $(MSVC2013_COMPAT_CXXFLAGS)
 
 libgallium_la_SOURCES = \
        $(C_SOURCES) \
@@ -39,18 +34,25 @@ libgallium_la_SOURCES += \
 
 endif
 
-indices/u_indices_gen.c: $(srcdir)/indices/u_indices_gen.py
-       $(AM_V_at)$(MKDIR_P) indices
-       $(AM_V_GEN) $(PYTHON2) $< > $@
+libgallium_la_LDFLAGS = $(LIBSENSORS_LDFLAGS)
 
-indices/u_unfilled_gen.c: $(srcdir)/indices/u_unfilled_gen.py
-       $(AM_V_at)$(MKDIR_P) indices
-       $(AM_V_GEN) $(PYTHON2) $< > $@
+MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
+PYTHON_GEN =  $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
 
-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
-       $(AM_V_at)$(MKDIR_P) util
-       $(AM_V_GEN) $(PYTHON2) $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format.csv > $@
+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 = \
@@ -62,15 +64,7 @@ COMMON_VL_CFLAGS = \
        $(AM_CFLAGS) \
        $(VL_CFLAGS) \
        $(DRI2PROTO_CFLAGS) \
-       $(LIBDRM_CFLAGS) \
-       $(GALLIUM_PIPE_LOADER_DEFINES) \
-       -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\"
-
-if HAVE_GALLIUM_STATIC_TARGETS
-COMMON_VL_CFLAGS += \
-       -DGALLIUM_STATIC_TARGETS=1
-
-endif # HAVE_GALLIUM_STATIC_TARGETS
+       $(LIBDRM_CFLAGS)
 
 noinst_LTLIBRARIES += libgalliumvl.la
 
@@ -90,6 +84,13 @@ libgalliumvlwinsys_la_CFLAGS = \
 libgalliumvlwinsys_la_SOURCES = \
        $(VL_WINSYS_SOURCES)
 
+if HAVE_DRI3
+
+libgalliumvlwinsys_la_SOURCES += \
+       $(VL_WINSYS_DRI3_SOURCES)
+
+endif
+
 endif
 
 endif