OSDN Git Service

automake: intel: correctly append to the LIBADD variable
authorEmil Velikov <emil.velikov@collabora.com>
Mon, 23 Oct 2017 12:29:30 +0000 (13:29 +0100)
committerEmil Velikov <emil.l.velikov@gmail.com>
Wed, 8 Nov 2017 14:23:57 +0000 (14:23 +0000)
Commit 05fc62d89f5 sets the variable, yet it forgot the update the
existing reference to append (instead of assign).

Thus as-is the expat library was discarded from the link chain when
building with Android.

Fixes: 05fc62d89f5 ("automake: intel: move expat handling where it's
used")
Cc: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
src/intel/Makefile.common.am

index 894dbb5..443cefc 100644 (file)
@@ -27,5 +27,5 @@ common_libintel_common_la_LIBADD = $(EXPAT_LIBS)
 
 if HAVE_PLATFORM_ANDROID
 common_libintel_common_la_CFLAGS += $(ANDROID_CFLAGS)
-common_libintel_common_la_LIBADD = $(ANDROID_LIBS)
+common_libintel_common_la_LIBADD += $(ANDROID_LIBS)
 endif