build: Only clean the architecture subdirectory we build for.

This allows simplifying the Makefiles; it is no longer necessary to register arch subdirectory Makefiles, just putting them in place is enough.

Diego Biurrun committed 14 years ago

Commit e7e19b11 parent 6a7c5316 files · +3 −13Browse files

Unified · Split

6 files

@@ -98,7 +98,7 @@ config.h: .config · 97 unmodified lines
98	@-printf '\nWARNING: $(?F) newer than config.h, rerun configure\n\n'	98	@-printf '\nWARNING: $(?F) newer than config.h, rerun configure\n\n'
99	@-tput sgr0 2>/dev/null	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	ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \	102	ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \
103	ALTIVEC-OBJS ARMV6-OBJS MMX-OBJS NEON-OBJS YASM-OBJS \	103	ALTIVEC-OBJS ARMV6-OBJS MMX-OBJS NEON-OBJS YASM-OBJS \
104	OBJS TESTOBJS	104	OBJS TESTOBJS

@@ -709,8 +709,6 @@ HOSTPROGS = aac_tablegen aacps_tablegen cbrt_tablegen cos_tablegen \ · 708 unmodified lines
709	dv_tablegen motionpixels_tablegen mpegaudio_tablegen \	709	dv_tablegen motionpixels_tablegen mpegaudio_tablegen \
710	pcm_tablegen qdm2_tablegen sinewin_tablegen	710	pcm_tablegen qdm2_tablegen sinewin_tablegen
711		711
712	DIRS = alpha arm avr32 bfin mips ppc sh4 sparc x86
713
714	CLEANFILES = _tables.c _tables.h *_tablegen$(HOSTEXESUF)	712	CLEANFILES = _tables.c _tables.h *_tablegen$(HOSTEXESUF)
715		713
716	$(SUBDIR)dct-test$(EXESUF): $(SUBDIR)dctref.o	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	OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o	70	OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o
71		71
72	DIRS = x86
73
74	TOOLS = graph2dot lavfi-showfiltfmts	72	TOOLS = graph2dot lavfi-showfiltfmts

@@ -78,6 +78,4 @@ OBJS-$(ARCH_X86) += x86/cpu.o · 77 unmodified lines
78	TESTPROGS = adler32 aes avstring base64 cpu crc des eval fifo lfg lls \	78	TESTPROGS = adler32 aes avstring base64 cpu crc des eval fifo lfg lls \
79	md5 opt parseutils sha tree	79	md5 opt parseutils sha tree
80		80
81	DIRS = arm avr32 bfin mips ppc sh4 tomi x86
82
83	ARCH_HEADERS = bswap.h intmath.h intreadwrite.h timer.h	81	ARCH_HEADERS = bswap.h intmath.h intreadwrite.h timer.h

 clean::
 	$(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
-	    $(foreach dir,$(DIRS),$(CLEANSUFFIXES:%=$(SUBDIR)$(dir)/%)) \
+	    $(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) $(HOSTOBJS) $(HOSTPROGS)
-	    $(HOSTOBJS) $(HOSTPROGS)
 distclean:: clean
-	$(RM) $(DISTCLEANSUFFIXES:%=$(SUBDIR)%) \
+	$(RM) $(DISTCLEANSUFFIXES:%=$(SUBDIR)%) $(DISTCLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%)
-	    $(foreach dir,$(DIRS),$(DISTCLEANSUFFIXES:%=$(SUBDIR)$(dir)/%))
 install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
 	$(Q)mkdir -p "$(SHLIBDIR)"

@@ -29,5 +29,3 @@ MMX-OBJS-$(HAVE_YASM) += x86/input.o \ · 28 unmodified lines
29	OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o	29	OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o
30		30
31	TESTPROGS = colorspace swscale	31	TESTPROGS = colorspace swscale
32
33	DIRS = bfin ppc sparc x86

Keyboard shortcuts