@@ -98,7 +98,7 @@ config.h: .config

 	@-printf '\nWARNING: $(?F) newer than config.h, rerun configure\n\n'

 	@-tput sgr0 2>/dev/null

-SUBDIR_VARS := CLEANFILES DIRS EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \

+SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS      \

                ARCH_HEADERS BUILT_HEADERS SKIPHEADERS                    \

                ALTIVEC-OBJS ARMV6-OBJS MMX-OBJS NEON-OBJS YASM-OBJS      \

                OBJS TESTOBJS

@@ -709,8 +709,6 @@ HOSTPROGS = aac_tablegen aacps_tablegen cbrt_tablegen cos_tablegen      \

             dv_tablegen motionpixels_tablegen mpegaudio_tablegen        \

             pcm_tablegen qdm2_tablegen sinewin_tablegen

-DIRS = alpha arm avr32 bfin mips ppc sh4 sparc x86

-

 CLEANFILES = *_tables.c *_tables.h *_tablegen$(HOSTEXESUF)

 $(SUBDIR)dct-test$(EXESUF): $(SUBDIR)dctref.o

@@ -69,6 +69,4 @@ OBJS-$(CONFIG_TESTSRC_FILTER)                += vsrc_testsrc.o

 OBJS-$(CONFIG_NULLSINK_FILTER)               += vsink_nullsink.o

-DIRS = x86

-

 TOOLS = graph2dot lavfi-showfiltfmts

@@ -78,6 +78,4 @@ OBJS-$(ARCH_X86) += x86/cpu.o

 TESTPROGS = adler32 aes avstring base64 cpu crc des eval fifo lfg lls \

             md5 opt parseutils sha tree

-DIRS = arm avr32 bfin mips ppc sh4 tomi x86

-

 ARCH_HEADERS = bswap.h intmath.h intreadwrite.h timer.h

@@ -47,12 +47,10 @@ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver $(DEP_LIBS)

 clean::

 	$(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \

-	    $(foreach dir,$(DIRS),$(CLEANSUFFIXES:%=$(SUBDIR)$(dir)/%)) \

-	    $(HOSTOBJS) $(HOSTPROGS)

+	    $(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) $(HOSTOBJS) $(HOSTPROGS)

 distclean:: clean

-	$(RM) $(DISTCLEANSUFFIXES:%=$(SUBDIR)%) \

-	    $(foreach dir,$(DIRS),$(DISTCLEANSUFFIXES:%=$(SUBDIR)$(dir)/%))

+	$(RM) $(DISTCLEANSUFFIXES:%=$(SUBDIR)%) $(DISTCLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%)

 install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)

 	$(Q)mkdir -p "$(SHLIBDIR)"

@@ -29,5 +29,3 @@ MMX-OBJS-$(HAVE_YASM)      +=  x86/input.o              \

 OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o

 TESTPROGS = colorspace swscale

-

-DIRS = bfin ppc sparc x86