diff options
author | James Almer <jamrial@gmail.com> | 2017-10-01 18:21:02 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-10-01 18:26:36 -0300 |
commit | fd5f4ac0813c27c34c387f00044905a859e29e37 (patch) | |
tree | 7074b367c4ce2a3f34ac9a2fd9e870e0c4e086ad | |
parent | 2f7ca0b94e49c2bfce8bda3f883766101ebd7a9b (diff) | |
parent | c95169f0ec68bdeeabc5fde8aa4076f406242524 (diff) |
Merge commit 'c95169f0ec68bdeeabc5fde8aa4076f406242524'
* commit 'c95169f0ec68bdeeabc5fde8aa4076f406242524':
build: Move cli tool sources to a separate subdirectory
Merged-by: James Almer <jamrial@gmail.com>
-rw-r--r-- | Makefile | 60 | ||||
-rw-r--r-- | doc/examples/Makefile | 2 | ||||
-rw-r--r-- | fftools/Makefile | 57 | ||||
-rw-r--r-- | fftools/cmdutils.c (renamed from cmdutils.c) | 0 | ||||
-rw-r--r-- | fftools/cmdutils.h (renamed from cmdutils.h) | 6 | ||||
-rw-r--r-- | fftools/cmdutils_opencl.c (renamed from cmdutils_opencl.c) | 0 | ||||
-rw-r--r-- | fftools/ffmpeg.c (renamed from ffmpeg.c) | 0 | ||||
-rw-r--r-- | fftools/ffmpeg.h (renamed from ffmpeg.h) | 6 | ||||
-rw-r--r-- | fftools/ffmpeg_cuvid.c (renamed from ffmpeg_cuvid.c) | 0 | ||||
-rw-r--r-- | fftools/ffmpeg_filter.c (renamed from ffmpeg_filter.c) | 0 | ||||
-rw-r--r-- | fftools/ffmpeg_hw.c (renamed from ffmpeg_hw.c) | 0 | ||||
-rw-r--r-- | fftools/ffmpeg_opt.c (renamed from ffmpeg_opt.c) | 0 | ||||
-rw-r--r-- | fftools/ffmpeg_qsv.c (renamed from ffmpeg_qsv.c) | 0 | ||||
-rw-r--r-- | fftools/ffmpeg_videotoolbox.c (renamed from ffmpeg_videotoolbox.c) | 0 | ||||
-rw-r--r-- | fftools/ffplay.c (renamed from ffplay.c) | 0 | ||||
-rw-r--r-- | fftools/ffprobe.c (renamed from ffprobe.c) | 0 | ||||
-rw-r--r-- | fftools/ffserver.c (renamed from ffserver.c) | 0 | ||||
-rw-r--r-- | fftools/ffserver_config.c (renamed from ffserver_config.c) | 0 | ||||
-rw-r--r-- | fftools/ffserver_config.h (renamed from ffserver_config.h) | 6 |
19 files changed, 71 insertions, 66 deletions
@@ -15,31 +15,6 @@ vpath %.cu $(SRC_PATH) vpath %.ptx $(SRC_PATH) vpath %/fate_config.sh.template $(SRC_PATH) -AVPROGS-$(CONFIG_FFMPEG) += ffmpeg -AVPROGS-$(CONFIG_FFPLAY) += ffplay -AVPROGS-$(CONFIG_FFPROBE) += ffprobe -AVPROGS-$(CONFIG_FFSERVER) += ffserver - -AVPROGS := $(AVPROGS-yes:%=%$(PROGSSUF)$(EXESUF)) -INSTPROGS = $(AVPROGS-yes:%=%$(PROGSSUF)$(EXESUF)) -PROGS += $(AVPROGS) - -AVBASENAMES = ffmpeg ffplay ffprobe ffserver -ALLAVPROGS = $(AVBASENAMES:%=%$(PROGSSUF)$(EXESUF)) -ALLAVPROGS_G = $(AVBASENAMES:%=%$(PROGSSUF)_g$(EXESUF)) - -$(foreach prog,$(AVBASENAMES),$(eval OBJS-$(prog) += cmdutils.o)) -$(foreach prog,$(AVBASENAMES),$(eval OBJS-$(prog)-$(CONFIG_OPENCL) += cmdutils_opencl.o)) - -OBJS-ffmpeg += ffmpeg_opt.o ffmpeg_filter.o ffmpeg_hw.o -OBJS-ffmpeg-$(CONFIG_VIDEOTOOLBOX) += ffmpeg_videotoolbox.o -OBJS-ffmpeg-$(CONFIG_LIBMFX) += ffmpeg_qsv.o -ifndef CONFIG_VIDEOTOOLBOX -OBJS-ffmpeg-$(CONFIG_VDA) += ffmpeg_videotoolbox.o -endif -OBJS-ffmpeg-$(CONFIG_CUVID) += ffmpeg_cuvid.o -OBJS-ffserver += ffserver_config.o - TESTTOOLS = audiogen videogen rotozoom tiny_psnr tiny_ssim base64 audiomatch HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options @@ -69,8 +44,6 @@ FF_EXTRALIBS := $(FFEXTRALIBS) FF_DEP_LIBS := $(DEP_LIBS) FF_STATIC_DEP_LIBS := $(STATIC_DEP_LIBS) -all: $(AVPROGS) - $(TOOLS): %$(EXESUF): %.o $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) @@ -117,27 +90,17 @@ endef $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D)))) +include $(SRC_PATH)/fftools/Makefile include $(SRC_PATH)/doc/Makefile include $(SRC_PATH)/doc/examples/Makefile -define DOPROG -OBJS-$(1) += $(1).o $(OBJS-$(1)-yes) -$(1)$(PROGSSUF)_g$(EXESUF): $$(OBJS-$(1)) -$$(OBJS-$(1)): CFLAGS += $(CFLAGS-$(1)) -$(1)$(PROGSSUF)_g$(EXESUF): LDFLAGS += $(LDFLAGS-$(1)) -$(1)$(PROGSSUF)_g$(EXESUF): FF_EXTRALIBS += $(EXTRALIBS-$(1)) --include $$(OBJS-$(1):.o=.d) -endef - -$(foreach P,$(AVPROGS-yes),$(eval $(call DOPROG,$(P)))) - -ffprobe.o cmdutils.o libavcodec/utils.o libavformat/utils.o libavdevice/avdevice.o libavfilter/avfilter.o libavutil/utils.o libpostproc/postprocess.o libswresample/swresample.o libswscale/utils.o : libavutil/ffversion.h +libavcodec/utils.o libavformat/utils.o libavdevice/avdevice.o libavfilter/avfilter.o libavutil/utils.o libpostproc/postprocess.o libswresample/swresample.o libswscale/utils.o : libavutil/ffversion.h $(PROGS): %$(PROGSSUF)$(EXESUF): %$(PROGSSUF)_g$(EXESUF) $(CP) $< $@ $(STRIP) $@ -%$(PROGSSUF)_g$(EXESUF): %.o $(FF_DEP_LIBS) +%$(PROGSSUF)_g$(EXESUF): $(FF_DEP_LIBS) $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS) VERSION_SH = $(SRC_PATH)/ffbuild/version.sh @@ -153,37 +116,22 @@ libavutil/ffversion.h .version: # force version.sh to run whenever version might have changed -include .version -ifdef AVPROGS -install: install-progs install-data -endif - install: install-libs install-headers install-libs: install-libs-yes -install-progs-yes: -install-progs-$(CONFIG_SHARED): install-libs - -install-progs: install-progs-yes $(AVPROGS) - $(Q)mkdir -p "$(BINDIR)" - $(INSTALL) -c -m 755 $(INSTPROGS) "$(BINDIR)" - install-data: $(DATA_FILES) $(EXAMPLES_FILES) $(EXAMPLE_MAKEFILE) $(Q)mkdir -p "$(DATADIR)/examples" $(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)" $(INSTALL) -m 644 $(EXAMPLES_FILES) "$(DATADIR)/examples" $(INSTALL) -m 644 $(EXAMPLE_MAKEFILE:%=%.example) "$(DATADIR)/examples/Makefile" -uninstall: uninstall-libs uninstall-headers uninstall-progs uninstall-data - -uninstall-progs: - $(RM) $(addprefix "$(BINDIR)/", $(ALLAVPROGS)) +uninstall: uninstall-libs uninstall-headers uninstall-data uninstall-data: $(RM) -r "$(DATADIR)" clean:: - $(RM) $(ALLAVPROGS) $(ALLAVPROGS_G) $(RM) $(CLEANSUFFIXES) $(RM) $(CLEANSUFFIXES:%=compat/msvcrt/%) $(RM) $(CLEANSUFFIXES:%=compat/atomics/pthread/%) diff --git a/doc/examples/Makefile b/doc/examples/Makefile index f0c4f7969e..ff958d33c6 100644 --- a/doc/examples/Makefile +++ b/doc/examples/Makefile @@ -30,7 +30,7 @@ EXAMPLES_FILES := $(wildcard $(SRC_PATH)/doc/examples/*.c) $(SRC_PATH)/doc/examp EXAMPLE_MAKEFILE := $(SRC_PATH)/doc/examples/Makefile $(foreach P,$(DOC_EXAMPLES),$(eval OBJS-$(P:%$(PROGSSUF)$(EXESUF)=%) = $(P:%$(PROGSSUF)$(EXESUF)=%).o)) -$(DOC_EXAMPLES): %$(PROGSSUF)$(EXESUF): %.o +$(DOC_EXAMPLES_G): %$(PROGSSUF)_g$(EXESUF): %.o examples: $(DOC_EXAMPLES) diff --git a/fftools/Makefile b/fftools/Makefile new file mode 100644 index 0000000000..094f6d6265 --- /dev/null +++ b/fftools/Makefile @@ -0,0 +1,57 @@ +AVPROGS-$(CONFIG_FFMPEG) += ffmpeg +AVPROGS-$(CONFIG_FFPLAY) += ffplay +AVPROGS-$(CONFIG_FFPROBE) += ffprobe +AVPROGS-$(CONFIG_FFSERVER) += ffserver + +AVPROGS := $(AVPROGS-yes:%=%$(PROGSSUF)$(EXESUF)) +PROGS += $(AVPROGS) + +AVBASENAMES = ffmpeg ffplay ffprobe ffserver +ALLAVPROGS = $(AVBASENAMES:%=%$(PROGSSUF)$(EXESUF)) +ALLAVPROGS_G = $(AVBASENAMES:%=%$(PROGSSUF)_g$(EXESUF)) + +OBJS-ffmpeg += fftools/ffmpeg_opt.o fftools/ffmpeg_filter.o fftools/ffmpeg_hw.o +OBJS-ffmpeg-$(CONFIG_CUVID) += fftools/ffmpeg_cuvid.o +OBJS-ffmpeg-$(CONFIG_LIBMFX) += fftools/ffmpeg_qsv.o +ifndef CONFIG_VIDEOTOOLBOX +OBJS-ffmpeg-$(CONFIG_VDA) += fftools/ffmpeg_videotoolbox.o +endif +OBJS-ffmpeg-$(CONFIG_VIDEOTOOLBOX) += fftools/ffmpeg_videotoolbox.o +OBJS-ffserver += fftools/ffserver_config.o + +define DOFFTOOL +OBJS-$(1)-$(CONFIG_OPENCL) += fftools/cmdutils_opencl.o +OBJS-$(1) += fftools/cmdutils.o fftools/$(1).o $(OBJS-$(1)-yes) +$(1)$(PROGSSUF)_g$(EXESUF): $$(OBJS-$(1)) +$$(OBJS-$(1)): | fftools +$$(OBJS-$(1)): CFLAGS += $(CFLAGS-$(1)) +$(1)$(PROGSSUF)_g$(EXESUF): LDFLAGS += $(LDFLAGS-$(1)) +$(1)$(PROGSSUF)_g$(EXESUF): FF_EXTRALIBS += $(EXTRALIBS-$(1)) +-include $$(OBJS-$(1):.o=.d) +endef + +$(foreach P,$(AVPROGS-yes),$(eval $(call DOFFTOOL,$(P)))) + +all: $(AVPROGS) + +fftools/ffprobe.o fftools/cmdutils.o: libavutil/ffversion.h | fftools +OBJDIRS += fftools + +ifdef AVPROGS +install: install-progs install-data +endif + +install-progs-yes: +install-progs-$(CONFIG_SHARED): install-libs + +install-progs: install-progs-yes $(AVPROGS) + $(Q)mkdir -p "$(BINDIR)" + $(INSTALL) -c -m 755 $(AVPROGS) "$(BINDIR)" + +uninstall: uninstall-progs + +uninstall-progs: + $(RM) $(addprefix "$(BINDIR)/", $(ALLAVPROGS)) + +clean:: + $(RM) $(ALLAVPROGS) $(ALLAVPROGS_G) $(CLEANSUFFIXES:%=fftools/%) diff --git a/cmdutils.c b/fftools/cmdutils.c index 3d428f3eea..3d428f3eea 100644 --- a/cmdutils.c +++ b/fftools/cmdutils.c diff --git a/cmdutils.h b/fftools/cmdutils.h index e1d64d8986..2997ee37b5 100644 --- a/cmdutils.h +++ b/fftools/cmdutils.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef CMDUTILS_H -#define CMDUTILS_H +#ifndef FFTOOLS_CMDUTILS_H +#define FFTOOLS_CMDUTILS_H #include <stdint.h> @@ -659,4 +659,4 @@ void *grow_array(void *array, int elem_size, int *size, int new_size); double get_rotation(AVStream *st); -#endif /* CMDUTILS_H */ +#endif /* FFTOOLS_CMDUTILS_H */ diff --git a/cmdutils_opencl.c b/fftools/cmdutils_opencl.c index 906aef4836..906aef4836 100644 --- a/cmdutils_opencl.c +++ b/fftools/cmdutils_opencl.c diff --git a/ffmpeg.c b/fftools/ffmpeg.c index 1d248bc269..1d248bc269 100644 --- a/ffmpeg.c +++ b/fftools/ffmpeg.c diff --git a/ffmpeg.h b/fftools/ffmpeg.h index d2deb432b7..f6c76bcc55 100644 --- a/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_H -#define FFMPEG_H +#ifndef FFTOOLS_FFMPEG_H +#define FFTOOLS_FFMPEG_H #include "config.h" @@ -676,4 +676,4 @@ int hw_device_setup_for_encode(OutputStream *ost); int hwaccel_decode_init(AVCodecContext *avctx); -#endif /* FFMPEG_H */ +#endif /* FFTOOLS_FFMPEG_H */ diff --git a/ffmpeg_cuvid.c b/fftools/ffmpeg_cuvid.c index 3ff3b40f17..3ff3b40f17 100644 --- a/ffmpeg_cuvid.c +++ b/fftools/ffmpeg_cuvid.c diff --git a/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index aacc185059..aacc185059 100644 --- a/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c diff --git a/ffmpeg_hw.c b/fftools/ffmpeg_hw.c index a4d1cada59..a4d1cada59 100644 --- a/ffmpeg_hw.c +++ b/fftools/ffmpeg_hw.c diff --git a/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 100fa76e46..100fa76e46 100644 --- a/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c diff --git a/ffmpeg_qsv.c b/fftools/ffmpeg_qsv.c index 7442750029..7442750029 100644 --- a/ffmpeg_qsv.c +++ b/fftools/ffmpeg_qsv.c diff --git a/ffmpeg_videotoolbox.c b/fftools/ffmpeg_videotoolbox.c index e9039654b9..e9039654b9 100644 --- a/ffmpeg_videotoolbox.c +++ b/fftools/ffmpeg_videotoolbox.c diff --git a/ffplay.c b/fftools/ffplay.c index 9f7774613c..9f7774613c 100644 --- a/ffplay.c +++ b/fftools/ffplay.c diff --git a/ffprobe.c b/fftools/ffprobe.c index b2e8949d9f..b2e8949d9f 100644 --- a/ffprobe.c +++ b/fftools/ffprobe.c diff --git a/ffserver.c b/fftools/ffserver.c index d4885dfa0e..d4885dfa0e 100644 --- a/ffserver.c +++ b/fftools/ffserver.c diff --git a/ffserver_config.c b/fftools/ffserver_config.c index 54135be989..54135be989 100644 --- a/ffserver_config.c +++ b/fftools/ffserver_config.c diff --git a/ffserver_config.h b/fftools/ffserver_config.h index 48d38dc325..089b8484da 100644 --- a/ffserver_config.h +++ b/fftools/ffserver_config.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFSERVER_CONFIG_H -#define FFSERVER_CONFIG_H +#ifndef FFTOOLS_FFSERVER_CONFIG_H +#define FFTOOLS_FFSERVER_CONFIG_H #define FFM_PACKET_SIZE 4096 @@ -152,4 +152,4 @@ int ffserver_parse_ffconfig(const char *filename, FFServerConfig *config); void ffserver_free_child_args(void *argsp); -#endif /* FFSERVER_CONFIG_H */ +#endif /* FFTOOLS_FFSERVER_CONFIG_H */ |