Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

build: Rename OBJDIRS variable to OUTDIRS

Browse source 
These directories are not just for object files.
This commit is contained in:
Diego Biurrun 2019-02-03 12:59:57 +01:00
parent 90b15f60bf
commit 7e5bde93a1
7 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -184,7 +184,7 @@ check: all alltools checkheaders examples testprogs fate
include $(SRC_PATH)/tests/Makefile include $(SRC_PATH)/tests/Makefile
$(sort $(OBJDIRS)): $(sort $(OUTDIRS)):
$(Q)mkdir -p $@ $(Q)mkdir -p $@
# Dummy rule to stop make trying to rebuild removed or renamed headers # Dummy rule to stop make trying to rebuild removed or renamed headers

2
avbuild/common.mak
View file

@ -47,7 +47,7 @@ $(HOSTOBJS): | $(sort $(dir $(HOSTOBJS)))
$(TESTOBJS): | $(sort $(dir $(TESTOBJS))) $(TESTOBJS): | $(sort $(dir $(TESTOBJS)))
$(TOOLOBJS): | tools $(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 *~ CLEANSUFFIXES = *.d *.gcda *.gcno *.h.c *.map *.o *.pc *.ver *.version *~
LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a

2
avtools/Makefile
View file

@ -28,7 +28,7 @@ $(foreach P,$(AVPROGS-yes),$(eval $(call DOAVTOOL,$(P))))
all: $(AVPROGS) all: $(AVPROGS)
avtools/cmdutils.o: avversion.h | avtools avtools/cmdutils.o: avversion.h | avtools
OBJDIRS += avtools OUTDIRS += avtools
ifdef AVPROGS ifdef AVPROGS
install: install-progs install-data install: install-progs install-data

2
doc/examples/Makefile
View file

@ -18,7 +18,7 @@ $(EXAMPLES): %$(EXESUF): %.o
examples: $(EXAMPLES) examples: $(EXAMPLES)
$(EXAMPLES:%$(EXESUF)=%.o): | doc/examples $(EXAMPLES:%$(EXESUF)=%.o): | doc/examples
OBJDIRS += doc/examples OUTDIRS += doc/examples
DOXY_INPUT += $(addprefix $(SRC_PATH)/, $(EXAMPLES:%$(EXESUF)=%.c)) DOXY_INPUT += $(addprefix $(SRC_PATH)/, $(EXAMPLES:%$(EXESUF)=%.c))

2
tests/Makefile
View file

@ -2,7 +2,7 @@ THREADS = 1
VREF = tests/vsynth1/00.pgm VREF = tests/vsynth1/00.pgm
AREF = tests/data/asynth1.sw 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 $(VREF): tests/videogen$(HOSTEXESUF) | tests/vsynth1
$(M)./$< 'tests/vsynth1/' $(M)./$< 'tests/vsynth1/'

2
tests/checkasm/Makefile
View file

@ -30,7 +30,7 @@ CHECKASMOBJS := $(sort $(CHECKASMOBJS:%=tests/checkasm/%))
CHECKASMDIRS := $(sort $(dir $(CHECKASMOBJS))) CHECKASMDIRS := $(sort $(dir $(CHECKASMOBJS)))
$(CHECKASMOBJS): | $(CHECKASMDIRS) $(CHECKASMOBJS): | $(CHECKASMDIRS)
OBJDIRS += $(CHECKASMDIRS) OUTDIRS += $(CHECKASMDIRS)
CHECKASM := tests/checkasm/checkasm$(EXESUF) CHECKASM := tests/checkasm/checkasm$(EXESUF)

2
tools/Makefile
View file

@ -3,7 +3,7 @@ TOOLS-$(CONFIG_ZLIB) += cws2fws
tools/cws2fws$(EXESUF): ELIBS = $(ZLIB) tools/cws2fws$(EXESUF): ELIBS = $(ZLIB)
OBJDIRS += tools OUTDIRS += tools
clean:: clean::
$(RM) $(CLEANSUFFIXES:%=tools/%) $(RM) $(CLEANSUFFIXES:%=tools/%)