projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
radeonsi: Make border colour state handling safe for integer textures
[mesa.git]
/
src
/
gallium
/
auxiliary
/
Makefile.am
diff --git
a/src/gallium/auxiliary/Makefile.am
b/src/gallium/auxiliary/Makefile.am
index b8ac7c9dd5ccf5645ea2b4a52bda6ef6b1f49565..f14279b4f9155b1068da1bd2c09859c0490a58d7 100644
(file)
--- a/
src/gallium/auxiliary/Makefile.am
+++ b/
src/gallium/auxiliary/Makefile.am
@@
-7,7
+7,10
@@
noinst_LTLIBRARIES = libgallium.la
AM_CFLAGS = \
-I$(top_srcdir)/src/gallium/auxiliary/util \
AM_CFLAGS = \
-I$(top_srcdir)/src/gallium/auxiliary/util \
- $(GALLIUM_CFLAGS)
+ $(GALLIUM_CFLAGS) \
+ $(VISIBILITY_CFLAGS)
+
+AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
libgallium_la_SOURCES = \
$(C_SOURCES) \
libgallium_la_SOURCES = \
$(C_SOURCES) \
@@
-18,7
+21,7
@@
if HAVE_MESA_LLVM
AM_CFLAGS += \
$(LLVM_CFLAGS)
AM_CFLAGS += \
$(LLVM_CFLAGS)
-AM_CXXFLAGS = \
+AM_CXXFLAGS
+
= \
$(GALLIUM_CFLAGS) \
$(LLVM_CXXFLAGS)
$(GALLIUM_CFLAGS) \
$(LLVM_CXXFLAGS)
@@
-45,7
+48,3
@@
util/u_format_srgb.c: $(srcdir)/util/u_format_srgb.py
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_GEN) $(PYTHON2) $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format.csv > $@
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_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