commit a4451b4a23d0dcb7734b1e24b0f35cc2e2072bd0
author Kuang-che Wu <kcwu@chromium.org> Fri May 09 17:23:54 2014
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri May 09 23:50:51 2014
tree 2797ad8195516fe6d58b02011743bdacaf7781bb
parent 7d7f3f86e3f862db7295a7245aa98f4a5c2edaa9

Makefile clean up

BUG=chromium:334332
TEST=build_package for amd64 and arm chromebook

Change-Id: Iacd807dd45d513669ed1cdc297242b9a6369eca1
Reviewed-on: https://chromium-review.googlesource.com/199057
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Kuang-che Wu <kcwu@chromium.org>
Tested-by: Kuang-che Wu <kcwu@chromium.org>

Makefile

diff --git a/Makefile b/Makefile
index b06089a..7d85181 100644
--- a/Makefile
+++ b/Makefile
@@ -4,28 +4,27 @@
 
 include common.mk
 
-ifeq ($(ARCH), x86)
-	CFLAGS += -DHAS_VAAPI -I$(SYSROOT)/usr/include
-	LDLIBS += -L$(SYSROOT)/usr/lib -lva-x11 -lX11 -lva
-else
-ifeq ($(ARCH), amd64)
-	CFLAGS += -DHAS_VAAPI -I$(SYSROOT)/usr/include
-	LDLIBS += -L$(SYSROOT)/usr/lib64 -lva-x11 -lX11 -lva
+PC_DEPS =
+
+USE_VAAPI ?= $(if $(filter $(ARCH),amd64 x86),yes,no)
+ifeq ($(USE_VAAPI),yes)
+  CPPFLAGS += -DHAS_VAAPI
+  PC_DEPS += libva-x11
+  VAAPI_OBJS = util_vaapi.o
 endif
-endif
+
+PC_CFLAGS := $(shell $(PKG_CONFIG) --cflags $(PC_DEPS))
+PC_LIBS := $(shell $(PKG_CONFIG) --libs $(PC_DEPS))
+
+CPPFLAGS += $(PC_CFLAGS)
+LDLIBS += $(PC_LIBS)
 
 CC_BINARY(avtest_label_detect): \
 	detect_hw_video_acc.o \
 	detect_webcam.o \
 	util.o \
 	util_v4l2.o \
-	main.o
-
-ifeq ($(ARCH), x86)
-CC_BINARY(avtest_label_detect): util_vaapi.o
-endif
-ifeq ($(ARCH), amd64)
-CC_BINARY(avtest_label_detect): util_vaapi.o
-endif
+	main.o \
+	$(VAAPI_OBJS)
 
 all: CC_BINARY(avtest_label_detect)