diff options
| author | Hongxu Jia <[email protected]> | 2017-10-18 09:47:05 +0800 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2017-10-18 14:27:20 +0100 |
| commit | 05fc62d89f59ce19a18bfd4e63a09624910d6caf (patch) | |
| tree | 6115066fe2e776ceb15944742b3c475d652907d7 | |
| parent | e5e9e21e9fec3552b9e6a3db45ece64fcf0bc9d1 (diff) | |
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 <[email protected]>
Reviewed-by: Lionel Landwerlin <[email protected]>
| -rw-r--r-- | src/intel/Makefile.common.am | 3 | ||||
| -rw-r--r-- | 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 49e9c6a4912..894dbb5208c 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 807122039b0..af8cd5b6287 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) |