falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

build: Rename OBJDIRS variable to OUTDIRS 

These directories are not just for object files.
tags/n4.2
Diego Biurrun 6 years ago
parent
90b15f60bf
commit
7e5bde93a1
7 changed files with 7 additions and 7 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      Makefile
  2. +1
    -1
      avbuild/common.mak
  3. +1
    -1
      avtools/Makefile
  4. +1
    -1
      doc/examples/Makefile
  5. +1
    -1
      tests/Makefile
  6. +1
    -1
      tests/checkasm/Makefile
  7. +1
    -1
      tools/Makefile

+ 1
- 1
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


+ 1
- 1
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


+ 1
- 1
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


+ 1
- 1
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))




+ 1
- 1
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/'


+ 1
- 1
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)




+ 1
- 1
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/%)


Write Preview
Loading…
Cancel
Save