diff options
| author | Jason Ekstrand <[email protected]> | 2016-04-13 20:25:39 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-04-13 20:25:39 -0700 |
| commit | 12f88ba32a14ea79134f4e995a55149f078a2f27 (patch) | |
| tree | 9070861dced23d0ad7dbec598bfd96b686eb7bf1 /src/gallium/auxiliary/Makefile.am | |
| parent | 79fbec30fc16399ede9385ef52cb62cefbb388f4 (diff) | |
| parent | 171a570f388b2895d14f6d5418c99573cffd6369 (diff) | |
Merge remote-tracking branch 'public/master' into vulkan
Diffstat (limited to 'src/gallium/auxiliary/Makefile.am')
| -rw-r--r-- | src/gallium/auxiliary/Makefile.am | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am index 82c2869b99b..296ed59317b 100644 --- a/src/gallium/auxiliary/Makefile.am +++ b/src/gallium/auxiliary/Makefile.am @@ -1,10 +1,11 @@ include Makefile.sources include $(top_srcdir)/src/gallium/Automake.inc -noinst_LTLIBRARIES = libgallium_nir.la +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) \ @@ -14,24 +15,11 @@ AM_CXXFLAGS = \ $(VISIBILITY_CXXFLAGS) \ $(MSVC2013_COMPAT_CXXFLAGS) -libgallium_nir_la_SOURCES = \ - $(NIR_SOURCES) - -libgallium_nir_la_CFLAGS = \ - -I$(top_builddir)/src/compiler/nir \ - $(GALLIUM_CFLAGS) \ - $(VISIBILITY_CFLAGS) \ - $(MSVC2013_COMPAT_CFLAGS) - -noinst_LTLIBRARIES += libgallium.la - libgallium_la_SOURCES = \ $(C_SOURCES) \ + $(NIR_SOURCES) \ $(GENERATED_SOURCES) -libgallium_la_LIBADD = \ - libgallium_nir.la - if HAVE_MESA_LLVM AM_CFLAGS += \ |