mirror of
https://github.com/librempeg/librempeg
synced 2024-11-23 19:58:59 +00:00
Rename 'tests' target to 'testprogs'. It is too easily confused with the
'test' target and a directory named tests exists. Originally committed as revision 18165 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
f1c5438fbb
commit
661ce28996
2
Makefile
2
Makefile
@ -47,7 +47,7 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF)
|
|||||||
cp -p $< $@
|
cp -p $< $@
|
||||||
$(STRIP) $@
|
$(STRIP) $@
|
||||||
|
|
||||||
SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTS EXAMPLES
|
SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES
|
||||||
|
|
||||||
define RESET
|
define RESET
|
||||||
$(1) :=
|
$(1) :=
|
||||||
|
10
common.mak
10
common.mak
@ -54,20 +54,20 @@ install: install-libs install-headers
|
|||||||
|
|
||||||
uninstall: uninstall-libs uninstall-headers
|
uninstall: uninstall-libs uninstall-headers
|
||||||
|
|
||||||
.PHONY: all depend dep *clean install* uninstall* examples tests
|
.PHONY: all depend dep *clean install* uninstall* examples testprogs
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CFLAGS += $(CFLAGS-yes)
|
CFLAGS += $(CFLAGS-yes)
|
||||||
OBJS += $(OBJS-yes)
|
OBJS += $(OBJS-yes)
|
||||||
FFLIBS := $(FFLIBS-yes) $(FFLIBS)
|
FFLIBS := $(FFLIBS-yes) $(FFLIBS)
|
||||||
TESTS += $(TESTS-yes)
|
TESTPROGS += $(TESTPROGS-yes)
|
||||||
|
|
||||||
FFEXTRALIBS := $(addprefix -l,$(addsuffix $(BUILDSUF),$(FFLIBS))) $(EXTRALIBS)
|
FFEXTRALIBS := $(addprefix -l,$(addsuffix $(BUILDSUF),$(FFLIBS))) $(EXTRALIBS)
|
||||||
FFLDFLAGS := $(addprefix -L$(BUILD_ROOT)/lib,$(FFLIBS)) $(LDFLAGS)
|
FFLDFLAGS := $(addprefix -L$(BUILD_ROOT)/lib,$(FFLIBS)) $(LDFLAGS)
|
||||||
|
|
||||||
EXAMPLES := $(addprefix $(SUBDIR),$(EXAMPLES))
|
EXAMPLES := $(addprefix $(SUBDIR),$(EXAMPLES))
|
||||||
OBJS := $(addprefix $(SUBDIR),$(OBJS))
|
OBJS := $(addprefix $(SUBDIR),$(OBJS))
|
||||||
TESTS := $(addprefix $(SUBDIR),$(TESTS))
|
TESTPROGS := $(addprefix $(SUBDIR),$(TESTPROGS))
|
||||||
|
|
||||||
DEP_LIBS:=$(foreach NAME,$(FFLIBS),lib$(NAME)/$($(BUILD_SHARED:yes=S)LIBNAME))
|
DEP_LIBS:=$(foreach NAME,$(FFLIBS),lib$(NAME)/$($(BUILD_SHARED:yes=S)LIBNAME))
|
||||||
|
|
||||||
@ -98,7 +98,7 @@ $(SUBDIR)x86/%.d: $(SUBDIR)x86/%.asm
|
|||||||
$(YASM) $(YASMFLAGS) -I $$(<D)/ -M -o $$(@:%.d=%.o) $$< > $$@
|
$(YASM) $(YASMFLAGS) -I $$(<D)/ -M -o $$(@:%.d=%.o) $$< > $$@
|
||||||
|
|
||||||
clean::
|
clean::
|
||||||
rm -f $(EXAMPLES) $(TESTS) $(addprefix $(SUBDIR),$(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
|
rm -f $(EXAMPLES) $(TESTPROGS) $(addprefix $(SUBDIR),$(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
|
||||||
$(addprefix $(SUBDIR), $(foreach suffix,$(CLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS))))
|
$(addprefix $(SUBDIR), $(foreach suffix,$(CLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS))))
|
||||||
|
|
||||||
distclean:: clean
|
distclean:: clean
|
||||||
@ -109,6 +109,6 @@ endef
|
|||||||
$(eval $(RULES))
|
$(eval $(RULES))
|
||||||
|
|
||||||
examples: $(EXAMPLES)
|
examples: $(EXAMPLES)
|
||||||
tests: $(TESTS)
|
testprogs: $(TESTPROGS)
|
||||||
|
|
||||||
-include $(DEPS)
|
-include $(DEPS)
|
||||||
|
@ -531,9 +531,9 @@ OBJS-$(HAVE_VIS) += sparc/dsputil_vis.o \
|
|||||||
|
|
||||||
EXAMPLES = apiexample$(EXESUF)
|
EXAMPLES = apiexample$(EXESUF)
|
||||||
|
|
||||||
TESTS = $(addsuffix -test$(EXESUF), cabac dct eval fft h264 rangecoder snow)
|
TESTPROGS = $(addsuffix -test$(EXESUF), cabac dct eval fft h264 rangecoder snow)
|
||||||
TESTS-$(ARCH_X86) += x86/cpuid-test$(EXESUF)
|
TESTPROGS-$(ARCH_X86) += x86/cpuid-test$(EXESUF)
|
||||||
TESTS-$(HAVE_MMX) += motion-test$(EXESUF)
|
TESTPROGS-$(HAVE_MMX) += motion-test$(EXESUF)
|
||||||
|
|
||||||
DIRS = alpha arm bfin mlib ppc ps2 sh4 sparc x86
|
DIRS = alpha arm bfin mlib ppc ps2 sh4 sparc x86
|
||||||
|
|
||||||
|
@ -243,4 +243,6 @@ OBJS-$(CONFIG_RTP_PROTOCOL) += rtpproto.o
|
|||||||
OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o
|
OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o
|
||||||
OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o
|
OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o
|
||||||
|
|
||||||
|
TESTPROGS = $(addsuffix -test$(EXESUF), timefilter)
|
||||||
|
|
||||||
include $(SUBDIR)../subdir.mak
|
include $(SUBDIR)../subdir.mak
|
||||||
|
@ -41,7 +41,7 @@ OBJS = adler32.o \
|
|||||||
tree.o \
|
tree.o \
|
||||||
utils.o \
|
utils.o \
|
||||||
|
|
||||||
TESTS = $(addsuffix -test$(EXESUF), adler32 aes base64 crc des lls md5 pca sha1 softfloat tree)
|
TESTPROGS = $(addsuffix -test$(EXESUF), adler32 aes base64 crc des lls md5 pca sha1 softfloat tree)
|
||||||
|
|
||||||
DIRS = arm bfin sh4 x86
|
DIRS = arm bfin sh4 x86
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user