Skip to content
Snippets Groups Projects
Commit 05fc62d8 authored by Hongxu Jia's avatar Hongxu Jia Committed by Eric Engestrom
Browse files

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: default avatarHongxu Jia <hongxu.jia@windriver.com>
Reviewed-by: default avatarLionel Landwerlin <lionel.g.landwerlin@intel.com>
parent e5e9e21e
No related branches found
No related tags found
Loading
......@@ -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)
......
......@@ -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)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment