Remove CONFIG_{DE,EN}CODERS from the build system.

Use CONFIG_AV1_DECODER and CONFIG_AV1_ENCODER instead.

Change-Id: I33d83aa6d31067d0db7a972d36927dc49c420f81
diff --git a/aom_dsp/aom_dsp.mk b/aom_dsp/aom_dsp.mk
index 483c430..b7943a1 100644
--- a/aom_dsp/aom_dsp.mk
+++ b/aom_dsp/aom_dsp.mk
@@ -22,7 +22,7 @@
 DSP_SRCS-yes += prob.c
 DSP_SRCS-$(CONFIG_ANS) += ans.h
 
-ifeq ($(CONFIG_ENCODERS),yes)
+ifeq ($(CONFIG_AV1_ENCODER),yes)
 ifeq ($(CONFIG_ANS),yes)
 DSP_SRCS-yes += answriter.h
 DSP_SRCS-yes += buf_ans.h
@@ -49,7 +49,7 @@
 DSP_SRCS-$(CONFIG_INTERNAL_STATS) += fastssim.c
 endif
 
-ifeq ($(CONFIG_DECODERS),yes)
+ifeq ($(CONFIG_AV1_DECODER),yes)
 ifeq ($(CONFIG_ANS),yes)
 DSP_SRCS-yes += ansreader.h
 else ifeq ($(CONFIG_DAALA_EC),yes)
@@ -327,7 +327,7 @@
 DSP_SRCS-$(HAVE_SSE2)   += x86/sum_squares_sse2.c
 endif # CONFIG_AV1_ENCODER
 
-ifeq ($(CONFIG_ENCODERS),yes)
+ifeq ($(CONFIG_AV1_ENCODER),yes)
 DSP_SRCS-yes            += sad.c
 DSP_SRCS-yes            += subtract.c
 
@@ -369,9 +369,9 @@
 DSP_SRCS-$(HAVE_SSE2) += x86/highbd_sad_sse2.asm
 endif  # CONFIG_HIGHBITDEPTH
 
-endif  # CONFIG_ENCODERS
+endif  # CONFIG_AV1_ENCODER
 
-ifneq ($(filter yes,$(CONFIG_ENCODERS)),)
+ifneq ($(filter yes,$(CONFIG_AV1_ENCODER)),)
 DSP_SRCS-yes            += variance.c
 DSP_SRCS-yes            += variance.h
 
@@ -401,7 +401,7 @@
 DSP_SRCS-$(HAVE_SSE2)   += x86/highbd_variance_impl_sse2.asm
 DSP_SRCS-$(HAVE_SSE2)   += x86/highbd_subpel_variance_impl_sse2.asm
 endif  # CONFIG_HIGHBITDEPTH
-endif  # CONFIG_ENCODERS
+endif  # CONFIG_AV1_ENCODER
 
 DSP_SRCS-no += $(DSP_SRCS_REMOVE-yes)
 
diff --git a/configure b/configure
index 064d5e7..ed48793 100755
--- a/configure
+++ b/configure
@@ -344,8 +344,6 @@
     internal_stats
     ${CODECS}
     ${CODEC_FAMILIES}
-    encoders
-    decoders
     static_msvcrt
     spatial_resampling
     realtime_only
diff --git a/examples.mk b/examples.mk
index 9520692..2aa4c35 100644
--- a/examples.mk
+++ b/examples.mk
@@ -64,7 +64,7 @@
 
 # List of examples to build. UTILS are tools meant for distribution
 # while EXAMPLES demonstrate specific portions of the API.
-UTILS-$(CONFIG_DECODERS)    += aomdec.c
+UTILS-$(CONFIG_AV1_DECODER) += aomdec.c
 aomdec.SRCS                 += md5_utils.c md5_utils.h
 aomdec.SRCS                 += aom_ports/mem_ops.h
 aomdec.SRCS                 += aom_ports/mem_ops_aligned.h
@@ -86,7 +86,7 @@
 endif
 aomdec.GUID                  = BA5FE66F-38DD-E034-F542-B1578C5FB950
 aomdec.DESCRIPTION           = Full featured decoder
-UTILS-$(CONFIG_ENCODERS)    += aomenc.c
+UTILS-$(CONFIG_AV1_ENCODER) += aomenc.c
 aomenc.SRCS                 += args.c args.h y4minput.c y4minput.h aomenc.h
 aomenc.SRCS                 += ivfdec.c ivfdec.h
 aomenc.SRCS                 += ivfenc.c ivfenc.h
@@ -112,7 +112,7 @@
 aomenc.DESCRIPTION           = Full featured encoder
 
 ifeq ($(CONFIG_ANALYZER),yes)
-  EXAMPLES-$(CONFIG_DECODERS)        += analyzer.cc
+  EXAMPLES-$(CONFIG_AV1_DECODER)     += analyzer.cc
   analyzer.GUID                       = 83827a8c-e3c3-4b19-8832-0cfc206c4496
   analyzer.SRCS                      += ivfdec.h ivfdec.c
   analyzer.SRCS                      += av1/decoder/inspection.h
@@ -123,20 +123,20 @@
 endif
 
 ifeq ($(CONFIG_INSPECTION),yes)
-EXAMPLES-$(CONFIG_DECODERS) += inspect.c
-inspect.GUID                 = FA46A420-3356-441F-B0FD-60AA1345C181
-inspect.SRCS                += ivfdec.h ivfdec.c
-inspect.SRCS                += args.c args.h
-inspect.SRCS                += tools_common.h tools_common.c
-inspect.SRCS                += video_common.h
-inspect.SRCS                += video_reader.h video_reader.c
-inspect.SRCS                += aom_ports/mem_ops.h
-inspect.SRCS                += aom_ports/mem_ops_aligned.h
-inspect.SRCS                += aom_ports/msvc.h
-inspect.DESCRIPTION          = Dump inspection data
+EXAMPLES-$(CONFIG_AV1_DECODER) += inspect.c
+inspect.GUID                   = FA46A420-3356-441F-B0FD-60AA1345C181
+inspect.SRCS                   += ivfdec.h ivfdec.c
+inspect.SRCS                   += args.c args.h
+inspect.SRCS                   += tools_common.h tools_common.c
+inspect.SRCS                   += video_common.h
+inspect.SRCS                   += video_reader.h video_reader.c
+inspect.SRCS                   += aom_ports/mem_ops.h
+inspect.SRCS                   += aom_ports/mem_ops_aligned.h
+inspect.SRCS                   += aom_ports/msvc.h
+inspect.DESCRIPTION             = Dump inspection data
 endif
 
-EXAMPLES-$(CONFIG_DECODERS)        += simple_decoder.c
+EXAMPLES-$(CONFIG_AV1_DECODER)     += simple_decoder.c
 simple_decoder.GUID                 = D3BBF1E9-2427-450D-BBFF-B2843C1D44CC
 simple_decoder.SRCS                += ivfdec.h ivfdec.c
 simple_decoder.SRCS                += tools_common.h tools_common.c
@@ -146,7 +146,7 @@
 simple_decoder.SRCS                += aom_ports/mem_ops_aligned.h
 simple_decoder.SRCS                += aom_ports/msvc.h
 simple_decoder.DESCRIPTION          = Simplified decoder loop
-EXAMPLES-$(CONFIG_DECODERS)        += decode_to_md5.c
+EXAMPLES-$(CONFIG_AV1_DECODER)     += decode_to_md5.c
 decode_to_md5.SRCS                 += md5_utils.h md5_utils.c
 decode_to_md5.SRCS                 += ivfdec.h ivfdec.c
 decode_to_md5.SRCS                 += tools_common.h tools_common.c
@@ -157,7 +157,7 @@
 decode_to_md5.SRCS                 += aom_ports/msvc.h
 decode_to_md5.GUID                  = 59120B9B-2735-4BFE-B022-146CA340FE42
 decode_to_md5.DESCRIPTION           = Frame by frame MD5 checksum
-EXAMPLES-$(CONFIG_ENCODERS)     += simple_encoder.c
+EXAMPLES-$(CONFIG_AV1_ENCODER)  += simple_encoder.c
 simple_encoder.SRCS             += ivfenc.h ivfenc.c
 simple_encoder.SRCS             += tools_common.h tools_common.c
 simple_encoder.SRCS             += video_common.h
@@ -173,7 +173,7 @@
 lossless_encoder.SRCS           += aom_ports/msvc.h
 lossless_encoder.GUID            = B63C7C88-5348-46DC-A5A6-CC151EF93366
 lossless_encoder.DESCRIPTION     = Simplified lossless encoder
-EXAMPLES-$(CONFIG_ENCODERS)     += twopass_encoder.c
+EXAMPLES-$(CONFIG_AV1_ENCODER)  += twopass_encoder.c
 twopass_encoder.SRCS            += ivfenc.h ivfenc.c
 twopass_encoder.SRCS            += tools_common.h tools_common.c
 twopass_encoder.SRCS            += video_common.h
@@ -181,7 +181,7 @@
 twopass_encoder.SRCS            += aom_ports/msvc.h
 twopass_encoder.GUID             = 73494FA6-4AF9-4763-8FBB-265C92402FD8
 twopass_encoder.DESCRIPTION      = Two-pass encoder loop
-EXAMPLES-$(CONFIG_DECODERS)     += decode_with_drops.c
+EXAMPLES-$(CONFIG_AV1_DECODER)  += decode_with_drops.c
 decode_with_drops.SRCS          += ivfdec.h ivfdec.c
 decode_with_drops.SRCS          += tools_common.h tools_common.c
 decode_with_drops.SRCS          += video_common.h
@@ -191,7 +191,7 @@
 decode_with_drops.SRCS          += aom_ports/msvc.h
 decode_with_drops.GUID           = CE5C53C4-8DDA-438A-86ED-0DDD3CDB8D26
 decode_with_drops.DESCRIPTION    = Drops frames while decoding
-EXAMPLES-$(CONFIG_ENCODERS)        += set_maps.c
+EXAMPLES-$(CONFIG_AV1_ENCODER)     += set_maps.c
 set_maps.SRCS                      += ivfenc.h ivfenc.c
 set_maps.SRCS                      += tools_common.h tools_common.c
 set_maps.SRCS                      += video_common.h
@@ -199,9 +199,9 @@
 set_maps.SRCS                      += aom_ports/msvc.h
 set_maps.GUID                       = ECB2D24D-98B8-4015-A465-A4AF3DCC145F
 set_maps.DESCRIPTION                = Set active and ROI maps
-ifeq ($(CONFIG_ENCODERS),yes)
-ifeq ($(CONFIG_DECODERS),yes)
-EXAMPLES-$(CONFIG_ENCODERS)        += aom_cx_set_ref.c
+ifeq ($(CONFIG_AV1_ENCODER),yes)
+ifeq ($(CONFIG_AV1_DECODER),yes)
+EXAMPLES-$(CONFIG_AV1_ENCODER)     += aom_cx_set_ref.c
 aom_cx_set_ref.SRCS                += ivfenc.h ivfenc.c
 aom_cx_set_ref.SRCS                += tools_common.h tools_common.c
 aom_cx_set_ref.SRCS                += examples/encoder_util.h
diff --git a/libs.mk b/libs.mk
index 4f2e5ca..b3ab8ab 100644
--- a/libs.mk
+++ b/libs.mk
@@ -69,7 +69,7 @@
   INSTALL-LIBS-yes += include/aom/aom.h include/aom/aomcx.h
   INSTALL_MAPS += include/aom/% $(SRC_PATH_BARE)/$(AV1_PREFIX)/%
   CODEC_DOC_SRCS += aom/aom.h aom/aomcx.h
-  CODEC_DOC_SECTIONS += av1 av1_encoder
+  CODEC_DOC_SECTIONS += av1 av1_encoder encoder
 endif
 
 ifeq ($(CONFIG_AV1_DECODER),yes)
@@ -81,20 +81,12 @@
   INSTALL-LIBS-yes += include/aom/aom.h include/aom/aomdx.h
   INSTALL_MAPS += include/aom/% $(SRC_PATH_BARE)/$(AV1_PREFIX)/%
   CODEC_DOC_SRCS += aom/aom.h aom/aomdx.h
-  CODEC_DOC_SECTIONS += av1 av1_decoder
+  CODEC_DOC_SECTIONS += av1 av1_decoder decoder
 endif
 
 AV1_PREFIX=av1/
 $(BUILD_PFX)$(AV1_PREFIX)%.c.o: CFLAGS += -Wextra
 
-ifeq ($(CONFIG_ENCODERS),yes)
-  CODEC_DOC_SECTIONS += encoder
-endif
-ifeq ($(CONFIG_DECODERS),yes)
-  CODEC_DOC_SECTIONS += decoder
-endif
-
-
 ifeq ($(CONFIG_MSVS),yes)
 CODEC_LIB=$(if $(CONFIG_STATIC_MSVCRT),aommt,aommd)
 GTEST_LIB=$(if $(CONFIG_STATIC_MSVCRT),gtestmt,gtestmd)
@@ -126,15 +118,15 @@
 INSTALL-SRCS-$(CONFIG_CODEC_SRCS) += third_party/x86inc/x86inc.asm
 endif
 CODEC_EXPORTS-yes += aom/exports_com
-CODEC_EXPORTS-$(CONFIG_ENCODERS) += aom/exports_enc
-CODEC_EXPORTS-$(CONFIG_DECODERS) += aom/exports_dec
+CODEC_EXPORTS-$(CONFIG_AV1_ENCODER) += aom/exports_enc
+CODEC_EXPORTS-$(CONFIG_AV1_DECODER) += aom/exports_dec
 
 INSTALL-LIBS-yes += include/aom/aom_codec.h
 INSTALL-LIBS-yes += include/aom/aom_frame_buffer.h
 INSTALL-LIBS-yes += include/aom/aom_image.h
 INSTALL-LIBS-yes += include/aom/aom_integer.h
-INSTALL-LIBS-$(CONFIG_DECODERS) += include/aom/aom_decoder.h
-INSTALL-LIBS-$(CONFIG_ENCODERS) += include/aom/aom_encoder.h
+INSTALL-LIBS-$(CONFIG_AV1_DECODER) += include/aom/aom_decoder.h
+INSTALL-LIBS-$(CONFIG_AV1_ENCODER) += include/aom/aom_encoder.h
 ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
 ifeq ($(CONFIG_MSVS),yes)
 INSTALL-LIBS-yes                  += $(foreach p,$(VS_PLATFORMS),$(LIBSUBDIR)/$(p)/$(CODEC_LIB).lib)
diff --git a/test/test-data.mk b/test/test-data.mk
index 168144a..083b349 100644
--- a/test/test-data.mk
+++ b/test/test-data.mk
@@ -1,22 +1,22 @@
 LIBAOM_TEST_SRCS-yes += test-data.mk
 
 # Encoder test source
-LIBAOM_TEST_DATA-$(CONFIG_ENCODERS) += hantro_collage_w352h288.yuv
-LIBAOM_TEST_DATA-$(CONFIG_ENCODERS) += hantro_odd.yuv
+LIBAOM_TEST_DATA-$(CONFIG_AV1_ENCODER) += hantro_collage_w352h288.yuv
+LIBAOM_TEST_DATA-$(CONFIG_AV1_ENCODER) += hantro_odd.yuv
 
-LIBAOM_TEST_DATA-$(CONFIG_ENCODERS) += park_joy_90p_10_420.y4m
-LIBAOM_TEST_DATA-$(CONFIG_ENCODERS) += park_joy_90p_10_422.y4m
-LIBAOM_TEST_DATA-$(CONFIG_ENCODERS) += park_joy_90p_10_444.y4m
-LIBAOM_TEST_DATA-$(CONFIG_ENCODERS) += park_joy_90p_10_440.yuv
-LIBAOM_TEST_DATA-$(CONFIG_ENCODERS) += park_joy_90p_12_420.y4m
-LIBAOM_TEST_DATA-$(CONFIG_ENCODERS) += park_joy_90p_12_422.y4m
-LIBAOM_TEST_DATA-$(CONFIG_ENCODERS) += park_joy_90p_12_444.y4m
-LIBAOM_TEST_DATA-$(CONFIG_ENCODERS) += park_joy_90p_12_440.yuv
-LIBAOM_TEST_DATA-$(CONFIG_ENCODERS) += park_joy_90p_8_420_a10-1.y4m
-LIBAOM_TEST_DATA-$(CONFIG_ENCODERS) += park_joy_90p_8_420.y4m
-LIBAOM_TEST_DATA-$(CONFIG_ENCODERS) += park_joy_90p_8_422.y4m
-LIBAOM_TEST_DATA-$(CONFIG_ENCODERS) += park_joy_90p_8_444.y4m
-LIBAOM_TEST_DATA-$(CONFIG_ENCODERS) += park_joy_90p_8_440.yuv
+LIBAOM_TEST_DATA-$(CONFIG_AV1_ENCODER) += park_joy_90p_10_420.y4m
+LIBAOM_TEST_DATA-$(CONFIG_AV1_ENCODER) += park_joy_90p_10_422.y4m
+LIBAOM_TEST_DATA-$(CONFIG_AV1_ENCODER) += park_joy_90p_10_444.y4m
+LIBAOM_TEST_DATA-$(CONFIG_AV1_ENCODER) += park_joy_90p_10_440.yuv
+LIBAOM_TEST_DATA-$(CONFIG_AV1_ENCODER) += park_joy_90p_12_420.y4m
+LIBAOM_TEST_DATA-$(CONFIG_AV1_ENCODER) += park_joy_90p_12_422.y4m
+LIBAOM_TEST_DATA-$(CONFIG_AV1_ENCODER) += park_joy_90p_12_444.y4m
+LIBAOM_TEST_DATA-$(CONFIG_AV1_ENCODER) += park_joy_90p_12_440.yuv
+LIBAOM_TEST_DATA-$(CONFIG_AV1_ENCODER) += park_joy_90p_8_420_a10-1.y4m
+LIBAOM_TEST_DATA-$(CONFIG_AV1_ENCODER) += park_joy_90p_8_420.y4m
+LIBAOM_TEST_DATA-$(CONFIG_AV1_ENCODER) += park_joy_90p_8_422.y4m
+LIBAOM_TEST_DATA-$(CONFIG_AV1_ENCODER) += park_joy_90p_8_444.y4m
+LIBAOM_TEST_DATA-$(CONFIG_AV1_ENCODER) += park_joy_90p_8_440.yuv
 
 LIBAOM_TEST_DATA-$(CONFIG_AV1_ENCODER) += desktop_credits.y4m
 LIBAOM_TEST_DATA-$(CONFIG_AV1_ENCODER) += niklas_1280_720_30.y4m
diff --git a/test/test.mk b/test/test.mk
index 0b45c58..9c4dccf 100644
--- a/test/test.mk
+++ b/test/test.mk
@@ -27,18 +27,18 @@
 ## Black box tests only use the public API.
 ##
 LIBAOM_TEST_SRCS-yes                   += ../md5_utils.h ../md5_utils.c
-LIBAOM_TEST_SRCS-$(CONFIG_DECODERS)    += ivf_video_source.h
-LIBAOM_TEST_SRCS-$(CONFIG_ENCODERS)    += ../y4minput.h ../y4minput.c
-LIBAOM_TEST_SRCS-$(CONFIG_ENCODERS)    += altref_test.cc
-LIBAOM_TEST_SRCS-$(CONFIG_ENCODERS)    += aq_segment_test.cc
-LIBAOM_TEST_SRCS-$(CONFIG_ENCODERS)    += datarate_test.cc
-LIBAOM_TEST_SRCS-$(CONFIG_ENCODERS)    += encode_api_test.cc
-LIBAOM_TEST_SRCS-$(CONFIG_ENCODERS)    += error_resilience_test.cc
-LIBAOM_TEST_SRCS-$(CONFIG_ENCODERS)    += i420_video_source.h
-#LIBAOM_TEST_SRCS-$(CONFIG_ENCODERS)    += realtime_test.cc
-#LIBAOM_TEST_SRCS-$(CONFIG_ENCODERS)    += resize_test.cc
-LIBAOM_TEST_SRCS-$(CONFIG_ENCODERS)    += y4m_video_source.h
-LIBAOM_TEST_SRCS-$(CONFIG_ENCODERS)    += yuv_video_source.h
+LIBAOM_TEST_SRCS-$(CONFIG_AV1_DECODER)    += ivf_video_source.h
+LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER)    += ../y4minput.h ../y4minput.c
+LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER)    += altref_test.cc
+LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER)    += aq_segment_test.cc
+LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER)    += datarate_test.cc
+LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER)    += encode_api_test.cc
+LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER)    += error_resilience_test.cc
+LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER)    += i420_video_source.h
+#LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER)    += realtime_test.cc
+#LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER)    += resize_test.cc
+LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER)    += y4m_video_source.h
+LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER)    += yuv_video_source.h
 
 #LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER) += level_test.cc
 LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER) += active_map_refresh_test.cc
@@ -50,14 +50,14 @@
 
 LIBAOM_TEST_SRCS-yes                   += decode_test_driver.cc
 LIBAOM_TEST_SRCS-yes                   += decode_test_driver.h
-LIBAOM_TEST_SRCS-$(CONFIG_ENCODERS)    += encode_test_driver.cc
+LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER)    += encode_test_driver.cc
 LIBAOM_TEST_SRCS-yes                   += encode_test_driver.h
 
 ## IVF writing.
-LIBAOM_TEST_SRCS-$(CONFIG_ENCODERS)    += ../ivfenc.c ../ivfenc.h
+LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER)    += ../ivfenc.c ../ivfenc.h
 
 ## Y4m parsing.
-LIBAOM_TEST_SRCS-$(CONFIG_ENCODERS)    += y4m_test.cc ../y4menc.c ../y4menc.h
+LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER)    += y4m_test.cc ../y4menc.c ../y4menc.h
 
 ## WebM Parsing
 ifeq ($(CONFIG_WEBM_IO), yes)
@@ -65,14 +65,14 @@
 LIBWEBM_PARSER_SRCS += ../third_party/libwebm/mkvparser/mkvreader.cc
 LIBWEBM_PARSER_SRCS += ../third_party/libwebm/mkvparser/mkvparser.h
 LIBWEBM_PARSER_SRCS += ../third_party/libwebm/mkvparser/mkvreader.h
-LIBAOM_TEST_SRCS-$(CONFIG_DECODERS)    += $(LIBWEBM_PARSER_SRCS)
-LIBAOM_TEST_SRCS-$(CONFIG_DECODERS)    += ../tools_common.h
-LIBAOM_TEST_SRCS-$(CONFIG_DECODERS)    += ../webmdec.cc
-LIBAOM_TEST_SRCS-$(CONFIG_DECODERS)    += ../webmdec.h
-LIBAOM_TEST_SRCS-$(CONFIG_DECODERS)    += webm_video_source.h
+LIBAOM_TEST_SRCS-$(CONFIG_AV1_DECODER) += $(LIBWEBM_PARSER_SRCS)
+LIBAOM_TEST_SRCS-$(CONFIG_AV1_DECODER) += ../tools_common.h
+LIBAOM_TEST_SRCS-$(CONFIG_AV1_DECODER) += ../webmdec.cc
+LIBAOM_TEST_SRCS-$(CONFIG_AV1_DECODER) += ../webmdec.h
+LIBAOM_TEST_SRCS-$(CONFIG_AV1_DECODER) += webm_video_source.h
 endif
 
-LIBAOM_TEST_SRCS-$(CONFIG_DECODERS)    += decode_api_test.cc
+LIBAOM_TEST_SRCS-$(CONFIG_AV1_DECODER) += decode_api_test.cc
 
 # Currently we only support decoder perf tests for av1. Also they read from WebM
 # files, so WebM IO is required.
@@ -81,7 +81,6 @@
 LIBAOM_TEST_SRCS-yes                   += decode_perf_test.cc
 endif
 
-# encode perf tests are av1 only
 ifeq ($(CONFIG_ENCODE_PERF_TESTS)$(CONFIG_AV1_ENCODER), yesyes)
 LIBAOM_TEST_SRCS-yes += encode_perf_test.cc
 endif
@@ -221,7 +220,7 @@
 ifeq ($(CONFIG_INTERNAL_STATS),yes)
 LIBAOM_TEST_SRCS-$(CONFIG_HIGHBITDEPTH) += hbd_metrics_test.cc
 endif
-LIBAOM_TEST_SRCS-$(CONFIG_ENCODERS) += sad_test.cc
+LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER) += sad_test.cc
 LIBAOM_TEST_SRCS-$(CONFIG_AV1) += av1_txfm_test.h
 LIBAOM_TEST_SRCS-$(CONFIG_AV1) += av1_txfm_test.cc
 LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER) += av1_fwd_txfm1d_test.cc