This allows simplifying the Makefiles; it is no longer necessary to register arch subdirectory Makefiles, just putting them in place is enough.
Unified · Split
| @@ -98,7 +98,7 @@ config.h: .config · 97 unmodified lines | ||
| 98 | 98 | @-printf '\nWARNING: $(?F) newer than config.h, rerun configure\n\n' |
| 99 | 99 | @-tput sgr0 2>/dev/null |
| 100 | 100 | |
| 101 | −SUBDIR_VARS := CLEANFILES DIRS EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \ | |
| 101 | +SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \ | |
| 102 | 102 | ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \ |
| 103 | 103 | ALTIVEC-OBJS ARMV6-OBJS MMX-OBJS NEON-OBJS YASM-OBJS \ |
| 104 | 104 | OBJS TESTOBJS |
| @@ -709,8 +709,6 @@ HOSTPROGS = aac_tablegen aacps_tablegen cbrt_tablegen cos_tablegen \ · 708 unmodified lines | ||
| 709 | 709 | dv_tablegen motionpixels_tablegen mpegaudio_tablegen \ |
| 710 | 710 | pcm_tablegen qdm2_tablegen sinewin_tablegen |
| 711 | 711 | |
| 712 | −DIRS = alpha arm avr32 bfin mips ppc sh4 sparc x86 | |
| 713 | − | |
| 714 | 712 | CLEANFILES = *_tables.c *_tables.h *_tablegen$(HOSTEXESUF) |
| 715 | 713 | |
| 716 | 714 | $(SUBDIR)dct-test$(EXESUF): $(SUBDIR)dctref.o |
| @@ -69,6 +69,4 @@ OBJS-$(CONFIG_TESTSRC_FILTER) += vsrc_testsrc.o · 68 unmodified lines | ||
| 69 | 69 | |
| 70 | 70 | OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o |
| 71 | 71 | |
| 72 | −DIRS = x86 | |
| 73 | − | |
| 74 | 72 | TOOLS = graph2dot lavfi-showfiltfmts |
| @@ -78,6 +78,4 @@ OBJS-$(ARCH_X86) += x86/cpu.o · 77 unmodified lines | ||
| 78 | 78 | TESTPROGS = adler32 aes avstring base64 cpu crc des eval fifo lfg lls \ |
| 79 | 79 | md5 opt parseutils sha tree |
| 80 | 80 | |
| 81 | −DIRS = arm avr32 bfin mips ppc sh4 tomi x86 | |
| 82 | − | |
| 83 | 81 | 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) · 46 unmodified lines | ||
| 47 | 47 | |
| 48 | 48 | clean:: |
| 49 | 49 | $(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \ |
| 50 | − $(foreach dir,$(DIRS),$(CLEANSUFFIXES:%=$(SUBDIR)$(dir)/%)) \ | |
| 51 | − $(HOSTOBJS) $(HOSTPROGS) | |
| 50 | + $(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) $(HOSTOBJS) $(HOSTPROGS) | |
| 52 | 51 | |
| 53 | 52 | distclean:: clean |
| 54 | − $(RM) $(DISTCLEANSUFFIXES:%=$(SUBDIR)%) \ | |
| 55 | − $(foreach dir,$(DIRS),$(DISTCLEANSUFFIXES:%=$(SUBDIR)$(dir)/%)) | |
| 53 | + $(RM) $(DISTCLEANSUFFIXES:%=$(SUBDIR)%) $(DISTCLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) | |
| 56 | 54 | |
| 57 | 55 | install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME) |
| 58 | 56 | $(Q)mkdir -p "$(SHLIBDIR)" |
| @@ -29,5 +29,3 @@ MMX-OBJS-$(HAVE_YASM) += x86/input.o \ · 28 unmodified lines | ||
| 29 | 29 | OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o |
| 30 | 30 | |
| 31 | 31 | TESTPROGS = colorspace swscale |
| 32 | − | |
| 33 | −DIRS = bfin ppc sparc x86 | |