aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2012-02-06 19:31:18 +0100
committerDiego Biurrun <diego@biurrun.de>2012-03-26 13:29:03 +0200
commite7e19b15c75dca9eddd5d41eb105853c29ea55fd (patch)
tree6864cabf57dacd21234b5b5433b825ca294f1dd1
parent6a7c5312d8caafc6b81803fdddfd7050e88d55f7 (diff)
downloadffmpeg-e7e19b15c75dca9eddd5d41eb105853c29ea55fd.tar.gz
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.
-rw-r--r--Makefile2
-rw-r--r--libavcodec/Makefile2
-rw-r--r--libavfilter/Makefile2
-rw-r--r--libavutil/Makefile2
-rw-r--r--library.mak6
-rw-r--r--libswscale/Makefile2
6 files changed, 3 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index 2d1c36d5fa..b5f8ad86aa 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 23270544e9..e4e5294db9 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -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
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 8af152da22..6ee94e9a1b 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -69,6 +69,4 @@ OBJS-$(CONFIG_TESTSRC_FILTER) += vsrc_testsrc.o
OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o
-DIRS = x86
-
TOOLS = graph2dot lavfi-showfiltfmts
diff --git a/libavutil/Makefile b/libavutil/Makefile
index 009094da87..a73fb79d0f 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -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
diff --git a/library.mak b/library.mak
index f50e8e59ee..6159799c5d 100644
--- a/library.mak
+++ b/library.mak
@@ -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)"
diff --git a/libswscale/Makefile b/libswscale/Makefile
index 04019307fd..7301646f4b 100644
--- a/libswscale/Makefile
+++ b/libswscale/Makefile
@@ -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