mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
build: Rename OBJDIRS variable to OUTDIRS
These directories are not just for object files.
This commit is contained in:
parent
90b15f60bf
commit
7e5bde93a1
2
Makefile
2
Makefile
@ -184,7 +184,7 @@ check: all alltools checkheaders examples testprogs fate
|
||||
|
||||
include $(SRC_PATH)/tests/Makefile
|
||||
|
||||
$(sort $(OBJDIRS)):
|
||||
$(sort $(OUTDIRS)):
|
||||
$(Q)mkdir -p $@
|
||||
|
||||
# Dummy rule to stop make trying to rebuild removed or renamed headers
|
||||
|
@ -47,7 +47,7 @@ $(HOSTOBJS): | $(sort $(dir $(HOSTOBJS)))
|
||||
$(TESTOBJS): | $(sort $(dir $(TESTOBJS)))
|
||||
$(TOOLOBJS): | tools
|
||||
|
||||
OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(TESTOBJS))
|
||||
OUTDIRS := $(OUTDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(TESTOBJS))
|
||||
|
||||
CLEANSUFFIXES = *.d *.gcda *.gcno *.h.c *.map *.o *.pc *.ver *.version *~
|
||||
LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a
|
||||
|
@ -28,7 +28,7 @@ $(foreach P,$(AVPROGS-yes),$(eval $(call DOAVTOOL,$(P))))
|
||||
all: $(AVPROGS)
|
||||
|
||||
avtools/cmdutils.o: avversion.h | avtools
|
||||
OBJDIRS += avtools
|
||||
OUTDIRS += avtools
|
||||
|
||||
ifdef AVPROGS
|
||||
install: install-progs install-data
|
||||
|
@ -18,7 +18,7 @@ $(EXAMPLES): %$(EXESUF): %.o
|
||||
examples: $(EXAMPLES)
|
||||
|
||||
$(EXAMPLES:%$(EXESUF)=%.o): | doc/examples
|
||||
OBJDIRS += doc/examples
|
||||
OUTDIRS += doc/examples
|
||||
|
||||
DOXY_INPUT += $(addprefix $(SRC_PATH)/, $(EXAMPLES:%$(EXESUF)=%.c))
|
||||
|
||||
|
@ -2,7 +2,7 @@ THREADS = 1
|
||||
VREF = tests/vsynth1/00.pgm
|
||||
AREF = tests/data/asynth1.sw
|
||||
|
||||
OBJDIRS += tests/data tests/vsynth1 tests/data/filtergraphs
|
||||
OUTDIRS += tests/data tests/vsynth1 tests/data/filtergraphs
|
||||
|
||||
$(VREF): tests/videogen$(HOSTEXESUF) | tests/vsynth1
|
||||
$(M)./$< 'tests/vsynth1/'
|
||||
|
@ -30,7 +30,7 @@ CHECKASMOBJS := $(sort $(CHECKASMOBJS:%=tests/checkasm/%))
|
||||
|
||||
CHECKASMDIRS := $(sort $(dir $(CHECKASMOBJS)))
|
||||
$(CHECKASMOBJS): | $(CHECKASMDIRS)
|
||||
OBJDIRS += $(CHECKASMDIRS)
|
||||
OUTDIRS += $(CHECKASMDIRS)
|
||||
|
||||
CHECKASM := tests/checkasm/checkasm$(EXESUF)
|
||||
|
||||
|
@ -3,7 +3,7 @@ TOOLS-$(CONFIG_ZLIB) += cws2fws
|
||||
|
||||
tools/cws2fws$(EXESUF): ELIBS = $(ZLIB)
|
||||
|
||||
OBJDIRS += tools
|
||||
OUTDIRS += tools
|
||||
|
||||
clean::
|
||||
$(RM) $(CLEANSUFFIXES:%=tools/%)
|
||||
|
Loading…
Reference in New Issue
Block a user