make: fix missing headers in dist

Change-Id: I259f2983d1e9446f3e29c74f44ae583a676ce81f
diff --git a/av1/av1_common.mk b/av1/av1_common.mk
index 8d4b394..02bd4a6 100644
--- a/av1/av1_common.mk
+++ b/av1/av1_common.mk
@@ -33,7 +33,7 @@
 AV1_COMMON_SRCS-yes += common/idct.h
 AV1_COMMON_SRCS-yes += common/idct.c
 AV1_COMMON_SRCS-yes += common/thread_common.h
-AV1_COMMON_SRCS-($CONFIG_LV_MAP) += common/txb_common.h
+AV1_COMMON_SRCS-$(CONFIG_LV_MAP) += common/txb_common.h
 AV1_COMMON_SRCS-yes += common/mv.h
 AV1_COMMON_SRCS-yes += common/onyxc_int.h
 AV1_COMMON_SRCS-yes += common/pred_common.h
@@ -107,7 +107,6 @@
 ifeq ($(CONFIG_PVQ),yes)
 # PVQ from daala
 AV1_COMMON_SRCS-yes += common/pvq.c
-AV1_COMMON_SRCS-yes += common/pvq.h
 AV1_COMMON_SRCS-yes += common/partition.c
 AV1_COMMON_SRCS-yes += common/partition.h
 AV1_COMMON_SRCS-yes += common/zigzag4.c
@@ -123,6 +122,9 @@
 AV1_COMMON_SRCS-$(HAVE_SSE4_1) += common/x86/pvq_sse4.c
 AV1_COMMON_SRCS-$(HAVE_SSE4_1) += common/x86/pvq_sse4.h
 endif
+ifneq ($(findstring yes,$(CONFIG_PVQ)$(CONFIG_DAALA_DIST)),)
+AV1_COMMON_SRCS-yes += common/pvq.h
+endif
 
 ifneq ($(CONFIG_AOM_HIGHBITDEPTH),yes)
 AV1_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/av1_itrans4_dspr2.c
diff --git a/av1/av1_cx.mk b/av1/av1_cx.mk
index 09eb401..e4ae420 100644
--- a/av1/av1_cx.mk
+++ b/av1/av1_cx.mk
@@ -123,10 +123,12 @@
 AV1_CX_SRCS-yes += encoder/daala_compat_enc.c
 AV1_CX_SRCS-yes += encoder/pvq_encoder.c
 AV1_CX_SRCS-yes += encoder/pvq_encoder.h
-AV1_CX_SRCS-yes += encoder/encint.h
 AV1_CX_SRCS-yes += encoder/generic_encoder.c
 AV1_CX_SRCS-yes += encoder/laplace_encoder.c
 endif
+ifneq ($(findstring yes,$(CONFIG_XIPHRC)$(CONFIG_PVQ)),)
+AV1_CX_SRCS-yes += encoder/encint.h
+endif
 
 AV1_CX_SRCS-$(HAVE_SSE2) += encoder/x86/av1_quantize_sse2.c
 AV1_CX_SRCS-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm