freedreno/ir3: fix register usage calculations

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

diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
index c5b8c0560066981da55cdd36b7b3c82260e9974c..27a8b3fe4201e8a874794eb48ca905b981d0e164 100644 (file)
--- a/src/gallium/auxiliary/Makefile.am
+++ b/src/gallium/auxiliary/Makefile.am
@@ -1,14 +1,23 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
+if HAVE_LOADER_GALLIUM
+SUBDIRS := pipe-loader
+endif
+
 include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
-SUBDIRS += pipebuffer
 noinst_LTLIBRARIES = libgallium.la
 
 AM_CFLAGS = \
        -I$(top_srcdir)/src/gallium/auxiliary/util \
-       $(GALLIUM_CFLAGS)
+       $(GALLIUM_CFLAGS) \
+       $(VISIBILITY_CFLAGS) \
+       $(MSVC2008_COMPAT_CXXFLAGS)
+
+AM_CXXFLAGS = \
+       $(VISIBILITY_CXXFLAGS) \
+       $(MSVC2008_COMPAT_CXXFLAGS)
 
 libgallium_la_SOURCES = \
        $(C_SOURCES) \
@@ -19,34 +28,80 @@ if HAVE_MESA_LLVM
 AM_CFLAGS += \
        $(LLVM_CFLAGS)
 
-AM_CXXFLAGS = \
+AM_CXXFLAGS += \
        $(GALLIUM_CFLAGS) \
        $(LLVM_CXXFLAGS)
 
-if LLVM_NEEDS_FNORTTI
-
-AM_CXXFLAGS += -fno-rtti
-
-endif
-
 libgallium_la_SOURCES += \
-       $(GALLIVM_SOURCES) \
-       $(GALLIVM_CPP_SOURCES)
+       $(GALLIVM_SOURCES)
 
 endif
 
 indices/u_indices_gen.c: $(srcdir)/indices/u_indices_gen.py
+       $(AM_V_at)$(MKDIR_P) indices
        $(AM_V_GEN) $(PYTHON2) $< > $@
 
 indices/u_unfilled_gen.c: $(srcdir)/indices/u_unfilled_gen.py
-       $(AM_V_GEN) $(PYTHON2) $< > $@
-
-util/u_format_srgb.c: $(srcdir)/util/u_format_srgb.py
+       $(AM_V_at)$(MKDIR_P) indices
        $(AM_V_GEN) $(PYTHON2) $< > $@
 
 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 > $@
 
-#XXX: Delete this when all targets are converted to automake.
-all-local: libgallium.la
-       ln -f $(builddir)/.libs/libgallium.a $(builddir)/libgallium.a
+
+noinst_LTLIBRARIES += libgalliumvl_stub.la
+libgalliumvl_stub_la_SOURCES = \
+       $(VL_STUB_SOURCES)
+
+if NEED_GALLIUM_VL
+
+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
+
+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)
+
+endif
+
+endif
+
+EXTRA_DIST = \
+       SConscript \
+       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_format.csv \
+       util/u_format_pack.py \
+       util/u_format_parse.py \
+       util/u_format_table.py