KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

automake: intel: move expat handling where it's used 

Linking libvulkan_intel.so can fail, due to unresolved references to
libexpat.so.

EXPAT_CFLAGS should be moved as well.

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
This commit is contained in:
Hongxu Jia 2017-10-18 09:47:05 +08:00 committed by Eric Engestrom
parent e5e9e21e9f
commit 05fc62d89f
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/intel/Makefile.common.am
View File

@ -21,8 +21,9 @@
noinst_LTLIBRARIES += common/libintel_common.la
common_libintel_common_la_CFLAGS = $(AM_CFLAGS) $(LIBDRM_CFLAGS)
common_libintel_common_la_CFLAGS = $(AM_CFLAGS) $(LIBDRM_CFLAGS) $(EXPAT_CFLAGS)
common_libintel_common_la_SOURCES = $(COMMON_FILES)
common_libintel_common_la_LIBADD = $(EXPAT_LIBS)
if HAVE_PLATFORM_ANDROID
common_libintel_common_la_CFLAGS += $(ANDROID_CFLAGS)

4
src/intel/Makefile.tools.am
View File

@ -31,7 +31,6 @@ tools_aubinator_SOURCES = \
tools_aubinator_CFLAGS = \
$(AM_CFLAGS) \
$(EXPAT_CFLAGS) \
$(ZLIB_CFLAGS)
tools_aubinator_LDADD = \
@ -41,7 +40,6 @@ tools_aubinator_LDADD = \
$(PER_GEN_LIBS) \
$(PTHREAD_LIBS) \
$(DLOPEN_LIBS) \
$(EXPAT_LIBS) \
$(ZLIB_LIBS) \
-lm
@ -56,10 +54,8 @@ tools_aubinator_error_decode_LDADD = \
compiler/libintel_compiler.la \
$(top_builddir)/src/util/libmesautil.la \
$(PTHREAD_LIBS) \
$(EXPAT_LIBS) \
$(ZLIB_LIBS)
tools_aubinator_error_decode_CFLAGS = \
$(AM_CFLAGS) \
$(EXPAT_CFLAGS) \
$(ZLIB_CFLAGS)