VP8: ARM NEON optimisations for dsp functions

[ffmpeg] / subdir.mak

diff --git a/subdir.mak b/subdir.mak
index aba2fe0c2fc4360568dc6233621ba8a7bc9e65c0..8a407fe1648e8fce4073d03a4de3d8d17a1f98be 100644 (file)
--- a/subdir.mak
+++ b/subdir.mak
@@ -10,10 +10,10 @@ THIS_LIB   := $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME)
 all-$(CONFIG_STATIC): $(SUBDIR)$(LIBNAME)
 all-$(CONFIG_SHARED): $(SUBDIR)$(SLIBNAME)
 
-$(SUBDIR)%-test.o: $(SUBDIR)%.c
+$(SUBDIR)%-test.o: $(SUBDIR)%-test.c
        $(CC) $(CPPFLAGS) $(CFLAGS) -DTEST -c $(CC_O) $^
 
-$(SUBDIR)%-test.o: $(SUBDIR)%-test.c
+$(SUBDIR)%-test.o: $(SUBDIR)%.c
        $(CC) $(CPPFLAGS) $(CFLAGS) -DTEST -c $(CC_O) $^
 
 $(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm
@@ -36,15 +36,6 @@ define RULES
 $(SUBDIR)%$(EXESUF): $(SUBDIR)%.o
        $$(LD) $(FFLDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS) $$(ELIBS)
 
-clean::
-       $(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
-           $(addprefix $(SUBDIR), $(foreach suffix,$(CLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS)))) \
-           $(HOSTOBJS) $(HOSTPROGS)
-
-distclean:: clean
-       $(RM)  $(addprefix $(SUBDIR),$(DISTCLEANSUFFIXES)) \
-            $(addprefix $(SUBDIR), $(foreach suffix,$(DISTCLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS))))
-
 $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
        $(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)
 
@@ -57,6 +48,15 @@ ifdef SUBDIR
 $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(DEP_LIBS)
 endif
 
+clean::
+       $(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
+           $(addprefix $(SUBDIR), $(foreach suffix,$(CLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS)))) \
+           $(HOSTOBJS) $(HOSTPROGS)
+
+distclean:: clean
+       $(RM)  $(addprefix $(SUBDIR),$(DISTCLEANSUFFIXES)) \
+            $(addprefix $(SUBDIR), $(foreach suffix,$(DISTCLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS))))
+
 install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
        $(Q)mkdir -p "$(SHLIBDIR)"
        $$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
@@ -67,9 +67,6 @@ install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
                $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
        $(SLIB_INSTALL_EXTRA_CMD)
 
-install-lib$(NAME)-static: MSG = $(LIBDIR)/$(LIBNAME)
-install-lib$(NAME)-shared: MSG = $(LIBDIR)/$(SLIBNAME)
-
 install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME)
        $(Q)mkdir -p "$(LIBDIR)"
        $$(INSTALL) -m 644 $$< "$(LIBDIR)"