Mesa (master): automake: intel: move expat handling where it's used

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 05fc62d89f59ce19a18bfd4e63a09624910d6caf
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=05fc62d89f59ce19a18bfd4e63a09624910d6caf

Author: Hongxu Jia <hongxu.jia at windriver.com>
Date:   Wed Oct 18 09:47:05 2017 +0800

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 at windriver.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>

---

 src/intel/Makefile.common.am | 3 ++-
 src/intel/Makefile.tools.am  | 4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/intel/Makefile.common.am b/src/intel/Makefile.common.am
index 49e9c6a491..894dbb5208 100644
--- a/src/intel/Makefile.common.am
+++ b/src/intel/Makefile.common.am
@@ -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)
diff --git a/src/intel/Makefile.tools.am b/src/intel/Makefile.tools.am
index 807122039b..af8cd5b628 100644
--- a/src/intel/Makefile.tools.am
+++ b/src/intel/Makefile.tools.am
@@ -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)